From 369e65200e5dd46e2a82c04b442a508d429ea5ba Mon Sep 17 00:00:00 2001 From: Aaron Brager Date: Sun, 26 May 2019 21:37:17 -0500 Subject: [PATCH 1/8] Migrate Sample Project to Swift 5 --- .../ViewControllers/ExampleViewController.swift | 2 +- QuickTableViewController.xcodeproj/project.pbxproj | 13 ++++++++++--- Source/Model/RadioSection.swift | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Example-iOS/ViewControllers/ExampleViewController.swift b/Example-iOS/ViewControllers/ExampleViewController.swift index 4bb80f92..09c4d3f2 100644 --- a/Example-iOS/ViewControllers/ExampleViewController.swift +++ b/Example-iOS/ViewControllers/ExampleViewController.swift @@ -122,7 +122,7 @@ internal final class ExampleViewController: QuickTableViewController { private func showDebuggingText(_ text: String) { print(text) debugging.rows = [NavigationRow(text: text, detailText: .none)] - if let section = tableContents.index(where: { $0 === debugging }) { + if let section = tableContents.firstIndex(where: { $0 === debugging }) { tableView.reloadSections([section], with: .none) } } diff --git a/QuickTableViewController.xcodeproj/project.pbxproj b/QuickTableViewController.xcodeproj/project.pbxproj index d3f76ddc..9948bee8 100644 --- a/QuickTableViewController.xcodeproj/project.pbxproj +++ b/QuickTableViewController.xcodeproj/project.pbxproj @@ -783,18 +783,18 @@ }; B51F21A11F417037009BC2C9 = { CreatedOnToolsVersion = 8.3.3; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Manual; }; B51F21BF1F41E600009BC2C9 = { CreatedOnToolsVersion = 8.3.3; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Manual; TestTargetID = B51F21A11F417037009BC2C9; }; B5334F121B8CC5BD00C64A6D = { CreatedOnToolsVersion = 6.4; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; }; B5334F1D1B8CC5BD00C64A6D = { CreatedOnToolsVersion = 6.4; @@ -821,6 +821,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -1363,6 +1364,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1383,6 +1385,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -1405,6 +1408,7 @@ PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 5.0; TEST_TARGET_NAME = "Example-iOS"; }; name = Debug; @@ -1427,6 +1431,7 @@ PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; TEST_TARGET_NAME = "Example-iOS"; }; name = Release; @@ -1567,6 +1572,7 @@ PRODUCT_NAME = QuickTableViewController; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1586,6 +1592,7 @@ PRODUCT_NAME = QuickTableViewController; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Source/Model/RadioSection.swift b/Source/Model/RadioSection.swift index f8a76de5..cc04d10a 100644 --- a/Source/Model/RadioSection.swift +++ b/Source/Model/RadioSection.swift @@ -69,7 +69,7 @@ open class RadioSection: Section { /// Returns the selected index, or nil when nothing is selected. open var indexOfSelectedOption: Int? { - return options.index { $0.isSelected } + return options.firstIndex { $0.isSelected } } /// Returns the selected option row, or nil when nothing is selected. @@ -97,7 +97,7 @@ open class RadioSection: Section { if option.isSelected { // Deselect the selected option. - return options.index(where: { $0 === option }).map { [$0] } ?? [] + return options.firstIndex(where: { $0 === option }).map { [$0] } ?? [] } var toggledIndexes: IndexSet = [] From 33ee9353d83c5853c9dba9285d1ad2b4fbf04900 Mon Sep 17 00:00:00 2001 From: Aaron Brager Date: Sun, 26 May 2019 21:37:45 -0500 Subject: [PATCH 2/8] Enable Clang localization warnings --- QuickTableViewController.xcodeproj/project.pbxproj | 4 +++- .../xcshareddata/xcschemes/Example-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/Example-tvOS.xcscheme | 2 +- .../xcschemes/QuickTableViewController-iOS.xcscheme | 2 +- .../xcschemes/QuickTableViewController-tvOS.xcscheme | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/QuickTableViewController.xcodeproj/project.pbxproj b/QuickTableViewController.xcodeproj/project.pbxproj index 9948bee8..b535e2bb 100644 --- a/QuickTableViewController.xcodeproj/project.pbxproj +++ b/QuickTableViewController.xcodeproj/project.pbxproj @@ -773,7 +773,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1000; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = bcylin; TargetAttributes = { 136DD2FC216A367B00F554F0 = { @@ -1440,6 +1440,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_CODE_COVERAGE = YES; @@ -1504,6 +1505,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_CODE_COVERAGE = YES; diff --git a/QuickTableViewController.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme b/QuickTableViewController.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme index d39fbe59..50c99bcd 100644 --- a/QuickTableViewController.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme +++ b/QuickTableViewController.xcodeproj/xcshareddata/xcschemes/Example-iOS.xcscheme @@ -1,6 +1,6 @@ Date: Sun, 26 May 2019 21:38:27 -0500 Subject: [PATCH 3/8] Migrate 'English' localization to 'en' --- QuickTableViewController.xcodeproj/project.pbxproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/QuickTableViewController.xcodeproj/project.pbxproj b/QuickTableViewController.xcodeproj/project.pbxproj index b535e2bb..088f3d51 100644 --- a/QuickTableViewController.xcodeproj/project.pbxproj +++ b/QuickTableViewController.xcodeproj/project.pbxproj @@ -818,10 +818,9 @@ }; buildConfigurationList = B5334F0D1B8CC5BD00C64A6D /* Build configuration list for PBXProject "QuickTableViewController" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); From 6b4247d0f6cefe71bc09e76229f4aaf7429ec497 Mon Sep 17 00:00:00 2001 From: Aaron Brager Date: Sun, 26 May 2019 21:40:03 -0500 Subject: [PATCH 4/8] Remove redundant modifiers for initializers declared in a public extension --- Source/Model/Deprecated.swift | 12 ++++++------ Source/Model/Subtitle.swift | 2 +- Source/Protocol/Reusable.swift | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Model/Deprecated.swift b/Source/Model/Deprecated.swift index fe9bf752..289139a7 100644 --- a/Source/Model/Deprecated.swift +++ b/Source/Model/Deprecated.swift @@ -29,12 +29,12 @@ import Foundation public extension Row { @available(*, deprecated, message: "Use `text` instead.") - public var title: String { + var title: String { return text } @available(*, deprecated, message: "Use `detailText` instead.") - public var subtitle: Subtitle? { + var subtitle: Subtitle? { return detailText?.subtitle } @@ -45,7 +45,7 @@ public extension Row { public extension NavigationRow { @available(*, deprecated, message: "Use `init(text:detailText:icon:customization:action:)` instead.") - public convenience init( + convenience init( title: String, subtitle: Subtitle, icon: Icon? = nil, @@ -68,7 +68,7 @@ public extension NavigationRow { public extension OptionRow { @available(*, deprecated, message: "Use `init(text:detailText:isSelected:icon:customization:action:)` instead.") - public convenience init( + convenience init( title: String, isSelected: Bool, icon: Icon? = nil, @@ -92,7 +92,7 @@ public extension OptionRow { public extension SwitchRow { @available(*, deprecated, message: "Use `init(text:detailText:switchValue:icon:customization:action:)` instead.") - public convenience init( + convenience init( title: String, switchValue: Bool, icon: Icon? = nil, @@ -116,7 +116,7 @@ public extension SwitchRow { public extension TapActionRow { @available(*, deprecated, message: "Use `init(text:customization:action:)` instead.") - public convenience init( + convenience init( title: String, customization: ((UITableViewCell, Row & RowStyle) -> Void)? = nil, action: ((Row) -> Void)? diff --git a/Source/Model/Subtitle.swift b/Source/Model/Subtitle.swift index 1021bcf2..e885eff3 100644 --- a/Source/Model/Subtitle.swift +++ b/Source/Model/Subtitle.swift @@ -64,7 +64,7 @@ public enum Subtitle: Equatable { internal extension DetailText { @available(*, deprecated, message: "The conversion between DetailText and Subtitle.") - internal var subtitle: Subtitle { + var subtitle: Subtitle { switch self { case .none: return .none case let .subtitle(text): return .belowTitle(text) diff --git a/Source/Protocol/Reusable.swift b/Source/Protocol/Reusable.swift index 1c3a98bd..6c77f27b 100644 --- a/Source/Protocol/Reusable.swift +++ b/Source/Protocol/Reusable.swift @@ -36,7 +36,7 @@ internal protocol Reusable { internal extension Reusable { - internal static var reuseIdentifier: String { + static var reuseIdentifier: String { let type = String(describing: self) return type.matches(of: String.typeDescriptionPattern).last ?? type } @@ -46,12 +46,12 @@ internal extension Reusable { internal extension String { - internal static var typeDescriptionPattern: String { + static var typeDescriptionPattern: String { // For the types in the format of "(CustomCell in _B5334F301B8CC6AA00C64A6D)" return "^\\(([\\w\\d]+)\\sin\\s_[0-9A-F]+\\)$" } - internal func matches(of pattern: String) -> [String] { + func matches(of pattern: String) -> [String] { let regex = try? NSRegularExpression(pattern: pattern, options: .caseInsensitive) #if swift(>=3.2) let fullText = NSRange(location: 0, length: count) From ed8b8a39ee403212f47c334f86b1ee8bcde84ccd Mon Sep 17 00:00:00 2001 From: Aaron Brager Date: Sun, 26 May 2019 21:52:09 -0500 Subject: [PATCH 5/8] Update SwiftLint to 0.32.0 (supports Swift 5) --- Podfile | 4 ++-- Podfile.lock | 14 ++++++++------ Source/Rows/NavigationRow.swift | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Podfile b/Podfile index 78b01f14..8c287428 100644 --- a/Podfile +++ b/Podfile @@ -20,10 +20,10 @@ end target "Example-iOS" do platform :ios, "8.0" - pod "SwiftLint", podspec: "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json" + pod "SwiftLint" end target "Example-tvOS" do platform :tvos, "9.0" - pod "SwiftLint", podspec: "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json" + pod "SwiftLint" end diff --git a/Podfile.lock b/Podfile.lock index d64414f3..ee9948e6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,12 +1,16 @@ PODS: - Nimble (8.0.1) - Quick (2.0.0) - - SwiftLint (0.27.0) + - SwiftLint (0.32.0) DEPENDENCIES: - Nimble (from `https://github.com/Quick/Nimble.git`, tag `v8.0.1`) - Quick (from `https://github.com/Quick/Quick.git`, tag `v2.0.0`) - - SwiftLint (from `https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json`) + - SwiftLint + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - SwiftLint EXTERNAL SOURCES: Nimble: @@ -15,8 +19,6 @@ EXTERNAL SOURCES: Quick: :git: https://github.com/Quick/Quick.git :tag: v2.0.0 - SwiftLint: - :podspec: https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.27.0/SwiftLint.podspec.json CHECKOUT OPTIONS: Nimble: @@ -29,8 +31,8 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0 Quick: 7143820c017e20f5b67967d60741f3b9ba0652d7 - SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073 + SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d -PODFILE CHECKSUM: efdcb8f949ea8eca6bb4091cfe2ddbeb63328c00 +PODFILE CHECKSUM: 0b70b4a6ac37cc21cfeceac9375c23cf23ee4704 COCOAPODS: 1.6.1 diff --git a/Source/Rows/NavigationRow.swift b/Source/Rows/NavigationRow.swift index 39ab847d..ebcd3f7a 100644 --- a/Source/Rows/NavigationRow.swift +++ b/Source/Rows/NavigationRow.swift @@ -147,10 +147,11 @@ private extension UITableViewCell.CellStyle { var stringValue: String { switch self { - case .default: return ".default" - case .subtitle: return ".subtitle" - case .value1: return ".value1" - case .value2: return ".value2" + case .default: return ".default" + case .subtitle: return ".subtitle" + case .value1: return ".value1" + case .value2: return ".value2" + @unknown default: return ".default" } } From dc82e9fa684bff2c6d92e900330f522162b61b37 Mon Sep 17 00:00:00 2001 From: Aaron Brager Date: Sun, 26 May 2019 21:57:06 -0500 Subject: [PATCH 6/8] Migrate other schemes --- .../project.pbxproj | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/QuickTableViewController.xcodeproj/project.pbxproj b/QuickTableViewController.xcodeproj/project.pbxproj index 088f3d51..b58e29b5 100644 --- a/QuickTableViewController.xcodeproj/project.pbxproj +++ b/QuickTableViewController.xcodeproj/project.pbxproj @@ -778,6 +778,7 @@ TargetAttributes = { 136DD2FC216A367B00F554F0 = { CreatedOnToolsVersion = 10.0; + LastSwiftMigration = 1020; ProvisioningStyle = Manual; TestTargetID = B54A24522088D44A00EEBA26; }; @@ -798,20 +799,21 @@ }; B5334F1D1B8CC5BD00C64A6D = { CreatedOnToolsVersion = 6.4; - LastSwiftMigration = 0930; + LastSwiftMigration = 1020; }; B54A24252088816D00EEBA26 = { CreatedOnToolsVersion = 9.3; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; B54A242D2088816E00EEBA26 = { CreatedOnToolsVersion = 9.3; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; B54A24522088D44A00EEBA26 = { CreatedOnToolsVersion = 9.3; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; }; @@ -1311,7 +1313,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TEST_TARGET_NAME = "Example-tvOS"; TVOS_DEPLOYMENT_TARGET = 12.0; @@ -1338,7 +1340,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TEST_TARGET_NAME = "Example-tvOS"; TVOS_DEPLOYMENT_TARGET = 12.0; @@ -1614,7 +1616,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = io.github.bcylin.QuickTableViewControllerTests; PRODUCT_NAME = QuickTableViewControllerTests; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1632,7 +1634,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.github.bcylin.QuickTableViewControllerTests; PRODUCT_NAME = QuickTableViewControllerTests; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -1661,6 +1663,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -1690,6 +1693,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -1715,6 +1719,7 @@ PRODUCT_NAME = QuickTableViewControllerTests; SDKROOT = appletvos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 11.3; }; @@ -1739,6 +1744,7 @@ PRODUCT_NAME = QuickTableViewControllerTests; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 11.3; }; @@ -1766,6 +1772,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -1792,6 +1799,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; From 60dab262c998436c42a80554517c5f1c017d59dd Mon Sep 17 00:00:00 2001 From: Aaron Brager Date: Sun, 26 May 2019 22:16:01 -0500 Subject: [PATCH 7/8] Upgrade Travis to Xcode 10.2.1 --- .travis.yml | 2 +- Podfile | 4 ++-- Podfile.lock | 14 ++++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b37b7d4..72401c80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode10.1 +osx_image: xcode10.2 cache: - bundler - cocoapods diff --git a/Podfile b/Podfile index 8c287428..31a85efc 100644 --- a/Podfile +++ b/Podfile @@ -20,10 +20,10 @@ end target "Example-iOS" do platform :ios, "8.0" - pod "SwiftLint" + pod "SwiftLint", git: "https://github.com/realm/SwiftLint.git", tag: "0.32.0", inhibit_warnings: true end target "Example-tvOS" do platform :tvos, "9.0" - pod "SwiftLint" + pod "SwiftLint", git: "https://github.com/realm/SwiftLint.git", tag: "0.32.0", inhibit_warnings: true end diff --git a/Podfile.lock b/Podfile.lock index ee9948e6..2bdaca4f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -6,11 +6,7 @@ PODS: DEPENDENCIES: - Nimble (from `https://github.com/Quick/Nimble.git`, tag `v8.0.1`) - Quick (from `https://github.com/Quick/Quick.git`, tag `v2.0.0`) - - SwiftLint - -SPEC REPOS: - https://github.com/cocoapods/specs.git: - - SwiftLint + - SwiftLint (from `https://github.com/realm/SwiftLint.git`, tag `0.32.0`) EXTERNAL SOURCES: Nimble: @@ -19,6 +15,9 @@ EXTERNAL SOURCES: Quick: :git: https://github.com/Quick/Quick.git :tag: v2.0.0 + SwiftLint: + :git: https://github.com/realm/SwiftLint.git + :tag: 0.32.0 CHECKOUT OPTIONS: Nimble: @@ -27,12 +26,15 @@ CHECKOUT OPTIONS: Quick: :git: https://github.com/Quick/Quick.git :tag: v2.0.0 + SwiftLint: + :git: https://github.com/realm/SwiftLint.git + :tag: 0.32.0 SPEC CHECKSUMS: Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0 Quick: 7143820c017e20f5b67967d60741f3b9ba0652d7 SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d -PODFILE CHECKSUM: 0b70b4a6ac37cc21cfeceac9375c23cf23ee4704 +PODFILE CHECKSUM: 7563cc2a312571c9060c1b9d78ff9ccb46920126 COCOAPODS: 1.6.1 From b02c03c4c6d1c4af11a256537520e24bd3d1ee8e Mon Sep 17 00:00:00 2001 From: Aaron Brager Date: Sun, 26 May 2019 23:04:38 -0500 Subject: [PATCH 8/8] Fix swiftlint on carthage --- Podfile | 4 ++-- Podfile.lock | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Podfile b/Podfile index 31a85efc..788a3514 100644 --- a/Podfile +++ b/Podfile @@ -20,10 +20,10 @@ end target "Example-iOS" do platform :ios, "8.0" - pod "SwiftLint", git: "https://github.com/realm/SwiftLint.git", tag: "0.32.0", inhibit_warnings: true + pod "SwiftLint", podspec: "https://raw.githubusercontent.com/CocoaPods/Specs/e3dd78c1879b219e3cb65096c75c5cb3f4db2a64/Specs/4/0/1/SwiftLint/0.32.0/SwiftLint.podspec.json" end target "Example-tvOS" do platform :tvos, "9.0" - pod "SwiftLint", git: "https://github.com/realm/SwiftLint.git", tag: "0.32.0", inhibit_warnings: true + pod "SwiftLint", podspec: "https://raw.githubusercontent.com/CocoaPods/Specs/e3dd78c1879b219e3cb65096c75c5cb3f4db2a64/Specs/4/0/1/SwiftLint/0.32.0/SwiftLint.podspec.json" end diff --git a/Podfile.lock b/Podfile.lock index 2bdaca4f..114b9a87 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -6,7 +6,7 @@ PODS: DEPENDENCIES: - Nimble (from `https://github.com/Quick/Nimble.git`, tag `v8.0.1`) - Quick (from `https://github.com/Quick/Quick.git`, tag `v2.0.0`) - - SwiftLint (from `https://github.com/realm/SwiftLint.git`, tag `0.32.0`) + - SwiftLint (from `https://raw.githubusercontent.com/CocoaPods/Specs/e3dd78c1879b219e3cb65096c75c5cb3f4db2a64/Specs/4/0/1/SwiftLint/0.32.0/SwiftLint.podspec.json`) EXTERNAL SOURCES: Nimble: @@ -16,8 +16,7 @@ EXTERNAL SOURCES: :git: https://github.com/Quick/Quick.git :tag: v2.0.0 SwiftLint: - :git: https://github.com/realm/SwiftLint.git - :tag: 0.32.0 + :podspec: https://raw.githubusercontent.com/CocoaPods/Specs/e3dd78c1879b219e3cb65096c75c5cb3f4db2a64/Specs/4/0/1/SwiftLint/0.32.0/SwiftLint.podspec.json CHECKOUT OPTIONS: Nimble: @@ -35,6 +34,6 @@ SPEC CHECKSUMS: Quick: 7143820c017e20f5b67967d60741f3b9ba0652d7 SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d -PODFILE CHECKSUM: 7563cc2a312571c9060c1b9d78ff9ccb46920126 +PODFILE CHECKSUM: c2b3624ca86aac41f65de787db50717db553cd5f COCOAPODS: 1.6.1