Migrated to Swift 5 (#97)

Jounce · Apr 24, 2019 · 28d1cb9 · 28d1cb9
1 parent a6dd5f6
commit 28d1cb9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.1
+5
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
-language: objective-c
-osx_image: xcode9.4
+language: swift
+osx_image: xcode10.2
 
 install:
-  - brew update && brew upgrade swiftlint
+  - brew update
+  - brew outdated swiftlint || brew upgrade swiftlint
 
 script:
   - swiftlint --strict

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Though, keep in mind: _Accelerate is not a silver bullet_. Under certain conditi
 
 _The infrastructure and best practices for distributing Swift libraries are currently in flux during this beta period of Swift & Xcode. In the meantime, you can add Surge as a git submodule, drag the `Surge.xcodeproj` file into your Xcode project, and add `Surge.framework` as a dependency for your target._
 
-Surge uses Swift 4.1. This means that your code has to be written in Swift 4.x due to current binary compatibility limitations.
+Surge uses Swift 5. This means that your code has to be written in Swift 5 due to current binary compatibility limitations.
 
 ### Swift Package Manager
 

diff --git a/Surge.xcodeproj/project.pbxproj b/Surge.xcodeproj/project.pbxproj
@@ -863,7 +863,6 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -894,7 +893,6 @@
 				PRODUCT_NAME = Surge;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -918,7 +916,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -942,7 +939,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.SurgeTests-macOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -971,7 +967,6 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1002,7 +997,6 @@
 				PRODUCT_NAME = Surge;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1026,7 +1020,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1050,7 +1043,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mattt.Surge-tvOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1081,7 +1073,6 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -1112,7 +1103,6 @@
 				PRODUCT_NAME = Surge;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -1201,7 +1191,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1256,7 +1246,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;