From 3cdabcadd7d4654280276b3cf6587f5021ec2452 Mon Sep 17 00:00:00 2001 From: scoreyou Date: Mon, 3 Dec 2018 12:42:55 +0300 Subject: [PATCH 1/2] New validator fork linked --- CHANGELOG.md | 4 ++++ LeadKitAdditions.podspec | 6 +++--- Podfile | 2 +- Podfile.lock | 10 +++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c83095e..3f6fb1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### 0.3.8 + +- **Fixed**: `SwiftValidator` fork moved to TouchInstinct repo, the used one is removed. Version number is downgraded to `4.0.2` to avoid collision when the original pod will update. + ### 0.3.7 - **Fixed**: `PassCodeError.tooManyAttempts` logic in `.create` and `.change` `PassCodeOperationType` diff --git a/LeadKitAdditions.podspec b/LeadKitAdditions.podspec index aea2008..945af1f 100644 --- a/LeadKitAdditions.podspec +++ b/LeadKitAdditions.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "LeadKitAdditions" - s.version = "0.3.7" + s.version = "0.3.8" s.summary = "iOS framework with a bunch of tools for rapid development" s.homepage = "https://github.com/TouchInstinct/LeadKitAdditions" s.license = "Apache License, Version 2.0" @@ -19,7 +19,7 @@ Pod::Spec.new do |s| ss.dependency "LeadKit", '~> 0.9.0' ss.dependency "KeychainAccess", '3.1.0' ss.dependency "CryptoSwift", '~> 0.9.0' - ss.dependency "SwiftValidator", '5.0.0' + ss.dependency "SwiftValidator", '4.0.2' ss.dependency "PinLayout", '~> 1.6' end @@ -36,7 +36,7 @@ Pod::Spec.new do |s| ss.dependency "LeadKit/Core-iOS-Extension", '~> 0.9.0' ss.dependency "KeychainAccess", '3.1.0' ss.dependency "CryptoSwift", '~> 0.9.0' - ss.dependency "SwiftValidator", '5.0.0' + ss.dependency "SwiftValidator", '4.0.2' ss.dependency "PinLayout", '~> 1.6' end diff --git a/Podfile b/Podfile index 03052c7..092d6b2 100644 --- a/Podfile +++ b/Podfile @@ -4,7 +4,7 @@ source "https://github.com/TouchInstinct/Podspecs.git" abstract_target 'LeadKitAdditions' do pod "KeychainAccess", '3.1.0' pod "CryptoSwift", "~> 0.9.0" - pod "SwiftValidator", '5.0.0' + pod "SwiftValidator", '4.0.2' pod "SwiftLint", '~> 0.25' pod "PinLayout", '~> 1.6' diff --git a/Podfile.lock b/Podfile.lock index e755037..f7235b1 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -28,7 +28,7 @@ PODS: - RxSwift (4.3.1) - SwiftDate (5.0.10) - SwiftLint (0.27.0) - - SwiftValidator (5.0.0) + - SwiftValidator (4.0.2) - TableKit (2.8.0) - UIScrollView-InfiniteScroll (1.1.0) @@ -39,7 +39,7 @@ DEPENDENCIES: - LeadKit/Core-iOS-Extension (~> 0.9.0) - PinLayout (~> 1.6) - SwiftLint (~> 0.25) - - SwiftValidator (= 5.0.0) + - SwiftValidator (= 4.0.2) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -69,10 +69,10 @@ SPEC CHECKSUMS: RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4 SwiftDate: fcdaa7ca22a903faf6d7ed231239a88d174dcae3 SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073 - SwiftValidator: 46cdd2061962df3ee8bab3c536dea9b34191d459 + SwiftValidator: 8517a67bceebd7286cb487da259db7dd44c5fc74 TableKit: d635663343d00e209f258e35d4ee0072ad1beb1a UIScrollView-InfiniteScroll: 3ef456bcbe759c19f510a383cff96e6647c98c98 -PODFILE CHECKSUM: 3a69f15c8923b9a8b4798d4e8e1caf8dc6293c6d +PODFILE CHECKSUM: 447350715f27bad97492296a2ed066c844cfaf5a -COCOAPODS: 1.6.0.beta.1 +COCOAPODS: 1.6.0.beta.2 From d42aeec8943bb3e9444072601c6fb8c2aa29b2bb Mon Sep 17 00:00:00 2001 From: scoreyou Date: Mon, 3 Dec 2018 12:51:16 +0300 Subject: [PATCH 2/2] Extensions target clear --- CHANGELOG.md | 1 + LeadKitAdditions.podspec | 3 ++- LeadKitAdditions.xcodeproj/project.pbxproj | 20 -------------------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f6fb1b..e255c9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### 0.3.8 - **Fixed**: `SwiftValidator` fork moved to TouchInstinct repo, the used one is removed. Version number is downgraded to `4.0.2` to avoid collision when the original pod will update. +- **Fixed**: Extensions target building. Removed all PassCode logic, SeparatorTableViewCell and PinLayoutTableViewCell from extensions target. ### 0.3.7 diff --git a/LeadKitAdditions.podspec b/LeadKitAdditions.podspec index 945af1f..91a0be4 100644 --- a/LeadKitAdditions.podspec +++ b/LeadKitAdditions.podspec @@ -30,7 +30,8 @@ Pod::Spec.new do |s| ss.exclude_files = [ "Sources/Classes/Cells/LabelTableViewCell/*.swift", "Sources/Services/Network/DefaultNetworkService+ActivityIndicator.swift", - "Sources/Extensions/Cells/**/*.swift" + "Sources/Extensions/Cells/**/*.swift", + "Sources/Controllers/Passcode/**/*.swift" ] ss.dependency "LeadKit/Core-iOS-Extension", '~> 0.9.0' diff --git a/LeadKitAdditions.xcodeproj/project.pbxproj b/LeadKitAdditions.xcodeproj/project.pbxproj index da26134..b1971c0 100644 --- a/LeadKitAdditions.xcodeproj/project.pbxproj +++ b/LeadKitAdditions.xcodeproj/project.pbxproj @@ -8,8 +8,6 @@ /* Begin PBXBuildFile section */ 248389A288C0A6D7914F0546 /* Pods_LeadKitAdditions_LeadKitAdditions_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0ED4A1B793EAA73C9E95969F /* Pods_LeadKitAdditions_LeadKitAdditions_iOS.framework */; }; - 3622F5D620E15DD1009DED94 /* PinLayoutTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67CF05AF206E99DF009A2AB9 /* PinLayoutTableViewCell.swift */; }; - 3622F5D720E15DD5009DED94 /* SeparatorTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67C2A41520724BBA000A5682 /* SeparatorTableViewCell.swift */; }; 6760AF1A207268EC00C2BB7E /* PinLayoutCell+DefaultImplementation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6760AF19207268EC00C2BB7E /* PinLayoutCell+DefaultImplementation.swift */; }; 67779CBC206986390098F024 /* BaseTextFieldViewEvents+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67779CBB206986390098F024 /* BaseTextFieldViewEvents+Extensions.swift */; }; 67779CBD206986390098F024 /* BaseTextFieldViewEvents+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67779CBB206986390098F024 /* BaseTextFieldViewEvents+Extensions.swift */; }; @@ -36,19 +34,12 @@ ED0C34071F2906EC00FAE9FD /* LoadingBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33D51F2906EC00FAE9FD /* LoadingBarButton.swift */; }; ED0C34081F2906EC00FAE9FD /* LoadingBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33D51F2906EC00FAE9FD /* LoadingBarButton.swift */; }; ED0C34091F2906EC00FAE9FD /* PassCodeConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33D91F2906EC00FAE9FD /* PassCodeConfiguration.swift */; }; - ED0C340A1F2906EC00FAE9FD /* PassCodeConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33D91F2906EC00FAE9FD /* PassCodeConfiguration.swift */; }; ED0C340B1F2906EC00FAE9FD /* PassCodeError.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33DA1F2906EC00FAE9FD /* PassCodeError.swift */; }; - ED0C340C1F2906EC00FAE9FD /* PassCodeError.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33DA1F2906EC00FAE9FD /* PassCodeError.swift */; }; ED0C340D1F2906EC00FAE9FD /* PassCodeHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33DB1F2906EC00FAE9FD /* PassCodeHolder.swift */; }; - ED0C340E1F2906EC00FAE9FD /* PassCodeHolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33DB1F2906EC00FAE9FD /* PassCodeHolder.swift */; }; ED0C340F1F2906EC00FAE9FD /* PassCodeHolderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33DC1F2906EC00FAE9FD /* PassCodeHolderProtocol.swift */; }; - ED0C34101F2906EC00FAE9FD /* PassCodeHolderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33DC1F2906EC00FAE9FD /* PassCodeHolderProtocol.swift */; }; ED0C34111F2906EC00FAE9FD /* PassCodeValidationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33DD1F2906EC00FAE9FD /* PassCodeValidationResult.swift */; }; - ED0C34121F2906EC00FAE9FD /* PassCodeValidationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33DD1F2906EC00FAE9FD /* PassCodeValidationResult.swift */; }; ED0C34131F2906EC00FAE9FD /* BasePassCodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33DF1F2906EC00FAE9FD /* BasePassCodeViewController.swift */; }; - ED0C34141F2906EC00FAE9FD /* BasePassCodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33DF1F2906EC00FAE9FD /* BasePassCodeViewController.swift */; }; ED0C34151F2906EC00FAE9FD /* BasePassCodeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33E11F2906EC00FAE9FD /* BasePassCodeViewModel.swift */; }; - ED0C34161F2906EC00FAE9FD /* BasePassCodeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33E11F2906EC00FAE9FD /* BasePassCodeViewModel.swift */; }; ED0C341F1F2906EC00FAE9FD /* UIBarButtonItem+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33E81F2906EC00FAE9FD /* UIBarButtonItem+Extensions.swift */; }; ED0C34201F2906EC00FAE9FD /* UIBarButtonItem+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33E81F2906EC00FAE9FD /* UIBarButtonItem+Extensions.swift */; }; ED0C34211F2906EC00FAE9FD /* UserDefaults+UserService.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33E91F2906EC00FAE9FD /* UserDefaults+UserService.swift */; }; @@ -64,7 +55,6 @@ ED0C34431F2906EC00FAE9FD /* ValidationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33FE1F2906EC00FAE9FD /* ValidationService.swift */; }; ED0C34441F2906EC00FAE9FD /* ValidationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33FE1F2906EC00FAE9FD /* ValidationService.swift */; }; EF5A43B1206E7A67003CED07 /* PassCodeDelayedDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF5A43B0206E7A67003CED07 /* PassCodeDelayedDescription.swift */; }; - EF5A43B2206E7A67003CED07 /* PassCodeDelayedDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF5A43B0206E7A67003CED07 /* PassCodeDelayedDescription.swift */; }; EFBD55921EBB9A980062AA63 /* LeadKitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = CAE698E61E968820000394B0 /* LeadKitAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ @@ -573,29 +563,19 @@ buildActionMask = 2147483647; files = ( 67779CBD206986390098F024 /* BaseTextFieldViewEvents+Extensions.swift in Sources */, - ED0C34101F2906EC00FAE9FD /* PassCodeHolderProtocol.swift in Sources */, ED0C34401F2906EC00FAE9FD /* ValidationError.swift in Sources */, - 3622F5D720E15DD5009DED94 /* SeparatorTableViewCell.swift in Sources */, ED0C34301F2906EC00FAE9FD /* BaseUserService.swift in Sources */, ED0C34421F2906EC00FAE9FD /* ValidationItem.swift in Sources */, ED0C34201F2906EC00FAE9FD /* UIBarButtonItem+Extensions.swift in Sources */, - ED0C340A1F2906EC00FAE9FD /* PassCodeConfiguration.swift in Sources */, 67B4E6FA206945F900E233EA /* OnlineValidationState.swift in Sources */, 67B4E6EB206941CE00E233EA /* BiometricsService.swift in Sources */, - ED0C34141F2906EC00FAE9FD /* BasePassCodeViewController.swift in Sources */, ED0C342E1F2906EC00FAE9FD /* BasePassCodeService.swift in Sources */, 67B4E6F7206945DD00E233EA /* OnlineValidationResult.swift in Sources */, - ED0C340E1F2906EC00FAE9FD /* PassCodeHolder.swift in Sources */, 67B4E6F3206945D200E233EA /* BaseTextFieldViewModel.swift in Sources */, ED0C34081F2906EC00FAE9FD /* LoadingBarButton.swift in Sources */, ED0C34221F2906EC00FAE9FD /* UserDefaults+UserService.swift in Sources */, - ED0C34121F2906EC00FAE9FD /* PassCodeValidationResult.swift in Sources */, ED0C34061F2906EC00FAE9FD /* BaseDateFormatter.swift in Sources */, - 3622F5D620E15DD1009DED94 /* PinLayoutTableViewCell.swift in Sources */, ED0C34441F2906EC00FAE9FD /* ValidationService.swift in Sources */, - EF5A43B2206E7A67003CED07 /* PassCodeDelayedDescription.swift in Sources */, - ED0C340C1F2906EC00FAE9FD /* PassCodeError.swift in Sources */, - ED0C34161F2906EC00FAE9FD /* BasePassCodeViewModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };