Drop Swift 3 support

Carthage · Jul 7, 2018 · 822c0fe · 822c0fe
1 parent 0396634
commit 822c0fe
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.1
+4.1.2
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ aliases:
     language: objective-c
   - &cocoapods
     script:
+      - rm .swift-version
       - pod repo update master
       - pod lib lint --verbose
     os: osx
@@ -41,14 +42,14 @@ matrix:
       osx_image: xcode9.2
       env: JOB=Xcode9.2
     - <<: *xcode
-      osx_image: xcode9.3
-      env: JOB=Xcode9.3
+      osx_image: xcode9.4
+      env: JOB=Xcode9.4
     - <<: *cocoapods
-      osx_image: xcode9.3
+      osx_image: xcode9.4
     - <<: *swiftpm_darwin
       osx_image: xcode9.2
     - <<: *swiftpm_darwin
-      osx_image: xcode9.3
+      osx_image: xcode9.4
     - <<: *swiftpm_linux
       env:
         - JOB=Linux
@@ -59,11 +60,7 @@ matrix:
     - <<: *swiftpm_linux
       env:
         - JOB=Linux
-        - SWIFT_VERSION=4.1.2
-    - <<: *swiftpm_linux
-      env:
-        - JOB=Linux
-        - SWIFT_VERSION=4.2-DEVELOPMENT-SNAPSHOT-2018-06-15-a
+        - SWIFT_VERSION=4.2-DEVELOPMENT-SNAPSHOT-2018-07-05-a
 
 notifications:
   email: false
@@ -85,4 +82,4 @@ deploy:
   on:
     repo: Carthage/Commandant
     tags: true
-    condition: $JOB = Xcode9.3
+    condition: $JOB = Xcode9.4
diff --git a/Commandant.podspec b/Commandant.podspec
@@ -27,4 +27,6 @@ Commandant is a Swift framework for parsing command-line arguments, inspired by
 
   s.dependency "Result", "~> 3.2"
 
+  s.cocoapods_version = ">= 1.4.0"
+  s.swift_version = "4.0"
 end
diff --git a/Commandant.xcodeproj/project.pbxproj b/Commandant.xcodeproj/project.pbxproj
@@ -416,7 +416,7 @@
 				ENABLE_TESTABILITY = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				ONLY_ACTIVE_ARCH = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -436,7 +436,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -516,7 +516,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -565,7 +565,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};

diff --git a/Package.swift b/Package.swift
@@ -16,5 +16,5 @@ let package = Package(
         .target(name: "Commandant", dependencies: ["Result"]),
         .testTarget(name: "CommandantTests", dependencies: ["Commandant", "Quick", "Nimble"]),
     ],
-    swiftLanguageVersions: [3, 4]
+    swiftLanguageVersions: [4]
 )