Merge pull request #142 from Carthage/swift-5.0

mdiep · web-flow · commit eb47db1e5b80 · 2019-03-07T08:10:40.000-05:00
Swift 5.0
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.1.2
+4.2
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ aliases:
   - &cocoapods
     script:
       - rm .swift-version
+      - gem update cocoapods
       - pod repo update master
       - pod lib lint --verbose
     os: osx
@@ -31,7 +32,7 @@ aliases:
     dist: trusty
     language: generic
     install:
-      - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
+      - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
 
 branches:
   only:
@@ -40,33 +41,32 @@ branches:
 matrix:
   include:
     - <<: *xcode
-      osx_image: xcode9.2
-      env: JOB=Xcode9.2
+      name: Xcode 10.1 / Swift 4.2.1
+      osx_image: xcode10.1
+      env: JOB=Xcode10.1
     - <<: *xcode
-      osx_image: xcode9.4
-      env: JOB=Xcode9.4
-    - <<: *xcode
-      osx_image: xcode10
-      env: JOB=Xcode10
+      name: Xcode 10.2 / Swift 5.0
+      osx_image: xcode10.2
+      env: JOB=Xcode10.2
     - <<: *cocoapods
-      osx_image: xcode9.4
-    - <<: *swiftpm_darwin
-      osx_image: xcode9.2
+      name: CocoaPods Lint
+      osx_image: xcode10.1
     - <<: *swiftpm_darwin
-      osx_image: xcode9.4
+      name: SwiftPM / Swift 4.2.1
+      osx_image: xcode10.1
     - <<: *swiftpm_darwin
-      osx_image: xcode10
-    - <<: *swiftpm_linux
-      env:
-        - JOB=Linux
-        - SWIFT_VERSION=4.0.3
+      name: SwiftPM / Swift 5.0
+      osx_image: xcode10.2
     - <<: *swiftpm_linux
+      name: Linux / Swift 4.2.3
       env:
         - JOB=Linux
+        - SWIFT_VESION=4.2.3
     - <<: *swiftpm_linux
+      name: Linux / Swift 5.0 Development
       env:
         - JOB=Linux
-        - SWIFT_VERSION=4.2
+        - SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a
 
 notifications:
   email: false
@@ -88,4 +88,4 @@ deploy:
   on:
     repo: Carthage/Commandant
     tags: true
-    condition: $JOB = Xcode9.4
+    condition: $JOB = Xcode10.1
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" ~> 0.9
-github "Quick/Quick" ~> 1.3
-github "Quick/Nimble" ~> 7.3
+github "Quick/Quick" ~> 2.0
+github "Quick/Nimble" ~> 8.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v7.3.1"
-github "Quick/Quick" "v1.3.2"
-github "antitypical/Result" "4.0.0"
+github "Quick/Nimble" "v8.0.0"
+github "Quick/Quick" "v2.0.0"
+github "antitypical/Result" "4.1.0"
 github "jspahrsummers/xcconfigs" "0.9"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit cd6dfb86f496fcd96ce0bc6da962cd936bf41903
+Subproject commit a27c5186ce2d65f60d1237660b2509df3eb29023
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit 5fbf13871d185526993130c3a1fad0b70bfe37ce
+Subproject commit 0b4ed6c706dd0cce923b5019a605a9bcc6b1b600
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 8fc088dcf72802801efeecba76ea8fb041fb773d
+Subproject commit 2ca499ba456795616fbc471561ff1d963e6ae160
diff --git a/Commandant.podspec b/Commandant.podspec
@@ -28,5 +28,5 @@ Commandant is a Swift framework for parsing command-line arguments, inspired by
   s.dependency "Result", "~> 4.0"
 
   s.cocoapods_version = ">= 1.4.0"
-  s.swift_version = "4.0"
+  s.swift_version = "4.2"
 end
diff --git a/Commandant.xcodeproj/project.pbxproj b/Commandant.xcodeproj/project.pbxproj
@@ -314,16 +314,16 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Carthage;
 				TargetAttributes = {
 					D00CCDD81A20717400109F8C = {
 						CreatedOnToolsVersion = 6.1.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1020;
 					};
 					D00CCDE31A20717400109F8C = {
 						CreatedOnToolsVersion = 6.1.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -405,6 +405,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D00CCDFA1A20719500109F8C /* Debug.xcconfig */;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
@@ -416,7 +417,7 @@
 				ENABLE_TESTABILITY = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				ONLY_ACTIVE_ARCH = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -426,6 +427,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D00CCDFC1A20719500109F8C /* Release.xcconfig */;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
@@ -436,7 +438,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -484,6 +486,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/CommandantTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -498,6 +501,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/CommandantTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -507,6 +511,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D00CCDFB1A20719500109F8C /* Profile.xcconfig */;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
@@ -516,7 +521,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -547,6 +552,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/CommandantTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -556,6 +562,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D00CCDFD1A20719500109F8C /* Test.xcconfig */;
 			buildSettings = {
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
@@ -565,7 +572,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -597,6 +604,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/CommandantTests/Info.plist;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
diff --git a/Commandant.xcodeproj/xcshareddata/xcschemes/Commandant.xcscheme b/Commandant.xcodeproj/xcshareddata/xcschemes/Commandant.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
 
 import PackageDescription
 
@@ -9,12 +9,12 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/antitypical/Result.git", from: "4.0.0"),
-        .package(url: "https://github.com/Quick/Quick.git", from: "1.3.0"),
-        .package(url: "https://github.com/Quick/Nimble.git", from: "7.3.0"),
+        .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0")
     ],
     targets: [
         .target(name: "Commandant", dependencies: ["Result"]),
-        .testTarget(name: "CommandantTests", dependencies: ["Commandant", "Quick", "Nimble"]),
+        .testTarget(name: "CommandantTests", dependencies: ["Commandant", "Quick", "Nimble"])
     ],
-    swiftLanguageVersions: [4]
+    swiftLanguageVersions: [.v4_2, .version("5")]
 )
diff --git a/Sources/Commandant/ArgumentParser.swift b/Sources/Commandant/ArgumentParser.swift
@@ -22,24 +22,6 @@ private enum RawArgument: Equatable {
 	case flag(OrderedSet<Character>)
 }
 
-#if !swift(>=4.1)
-private func ==(lhs: RawArgument, rhs: RawArgument) -> Bool {
-	switch (lhs, rhs) {
-	case let (.key(left), .key(right)):
-		return left == right
-
-	case let (.value(left), .value(right)):
-		return left == right
-
-	case let (.flag(left), .flag(right)):
-		return left == right
-
-	default:
-		return false
-	}
-}
-#endif
-
 extension RawArgument: CustomStringConvertible {
 	fileprivate var description: String {
 		switch self {
diff --git a/Sources/Commandant/OrderedSet.swift b/Sources/Commandant/OrderedSet.swift
@@ -10,22 +10,14 @@ internal struct OrderedSet<T: Hashable>: Equatable {
 
 	@discardableResult
 	mutating func remove(_ member: T) -> T? {
-		if let index = values.index(of: member) {
+		if let index = values.firstIndex(of: member) {
 			return values.remove(at: index)
 		} else {
 			return nil
 		}
 	}
 }
 
-#if !swift(>=4.1)
-extension OrderedSet {
-	static func == (_ lhs: OrderedSet, rhs: OrderedSet) -> Bool {
-		return lhs.values == rhs.values
-	}
-}
-#endif
-
 extension OrderedSet: Collection {
 	subscript(position: Int) -> T {
 		return values[position]
