Build: Updated to the Swift 5.0

- carthage components were updated too - there is a problem with the jdhealy/PrettyColors 5.0.2 is not buildable with the XCode 10.2. A Swift version needs to be increased manually to 5.0 fir now as a workaround.
vookimedlo · May 7, 2019 · 14c6092 · 14c6092
1 parent cca201a
commit 14c6092
Show file tree

Hide file tree

Showing 28 changed files with 13 additions and 49 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,5 +1,5 @@
-github "SwiftyJSON/SwiftyJSON" ~> 4.2
+github "SwiftyJSON/SwiftyJSON" ~> 5.0
 github "jdhealy/PrettyColors" ~> 5.0
-github "Carthage/Commandant" ~> 0.15
+github "Carthage/Commandant" ~> 0.17
 github "thoughtbot/Curry" ~> 4.0
 github "sparkle-project/Sparkle" ~> 1.21
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,5 @@
-github "Carthage/Commandant" "0.15.0"
-github "SwiftyJSON/SwiftyJSON" "4.2.0"
-github "antitypical/Result" "4.1.0"
-github "jdhealy/PrettyColors" "5.0.1"
-github "sparkle-project/Sparkle" "1.21.2"
-github "thoughtbot/Curry" "v4.0.1"
+github "Carthage/Commandant" "0.17.0"
+github "SwiftyJSON/SwiftyJSON" "5.0.0"
+github "jdhealy/PrettyColors" "5.0.2"
+github "sparkle-project/Sparkle" "1.21.3"
+github "thoughtbot/Curry" "v4.0.2"
diff --git a/src/CrosshairCommand.swift b/src/CrosshairCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct CrosshairCommand: CommandProtocol {

diff --git a/src/ck550.xcodeproj/project.pbxproj b/src/ck550.xcodeproj/project.pbxproj
@@ -178,8 +178,6 @@
 		8D90274E21D800B700D0EC40 /* Curry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E5721C19993009AF6E6 /* Curry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		8D90274F21D800B700D0EC40 /* PrettyColors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E4721C035C8009AF6E6 /* PrettyColors.framework */; };
 		8D90275021D800B700D0EC40 /* PrettyColors.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E4721C035C8009AF6E6 /* PrettyColors.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		8D90275121D800B700D0EC40 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E4F21C1859C009AF6E6 /* Result.framework */; };
-		8D90275221D800B700D0EC40 /* Result.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E4F21C1859C009AF6E6 /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		8D90275321D801DA00D0EC40 /* Terminal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D966E4921C0375F009AF6E6 /* Terminal.swift */; };
 		8D90275521D950F200D0EC40 /* ConfigurationChangedNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D90275421D950F200D0EC40 /* ConfigurationChangedNotification.swift */; };
 		8D90275A21D969FF00D0EC40 /* guiDefaultSettings.json in Sync a default configuration with assets */ = {isa = PBXBuildFile; fileRef = 8D90275821D969D800D0EC40 /* guiDefaultSettings.json */; };
@@ -206,8 +204,6 @@
 		8D966E4C21C18425009AF6E6 /* Commandant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E4B21C18425009AF6E6 /* Commandant.framework */; };
 		8D966E4D21C18490009AF6E6 /* Commandant.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E4B21C18425009AF6E6 /* Commandant.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		8D966E4E21C18490009AF6E6 /* PrettyColors.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E4721C035C8009AF6E6 /* PrettyColors.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		8D966E5021C1859C009AF6E6 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E4F21C1859C009AF6E6 /* Result.framework */; };
-		8D966E5121C185DD009AF6E6 /* Result.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E4F21C1859C009AF6E6 /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		8D966E5421C186A3009AF6E6 /* VersionCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D966E5321C186A3009AF6E6 /* VersionCommand.swift */; };
 		8D966E5621C18B79009AF6E6 /* MonitorCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D966E5521C18B79009AF6E6 /* MonitorCommand.swift */; };
 		8D966E5821C19993009AF6E6 /* Curry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D966E5721C19993009AF6E6 /* Curry.framework */; };
@@ -242,7 +238,6 @@
 			dstSubfolderSpec = 10;
 			files = (
 				8D966E5921C199D4009AF6E6 /* Curry.framework in Embed Frameworks */,
-				8D966E5121C185DD009AF6E6 /* Result.framework in Embed Frameworks */,
 				8D966E4D21C18490009AF6E6 /* Commandant.framework in Embed Frameworks */,
 				8D966E4E21C18490009AF6E6 /* PrettyColors.framework in Embed Frameworks */,
 				8D109A3921BC80D9007F2C30 /* SwiftyJSON.framework in Embed Frameworks */,
@@ -281,7 +276,6 @@
 				8D82DDC321F792EB0043F516 /* Sparkle.framework in Embed Frameworks */,
 				8D90275021D800B700D0EC40 /* PrettyColors.framework in Embed Frameworks */,
 				8D90274C21D800B700D0EC40 /* Commandant.framework in Embed Frameworks */,
-				8D90275221D800B700D0EC40 /* Result.framework in Embed Frameworks */,
 				8D73C65721D1855C0021FA4B /* SwiftyJSON.framework in Embed Frameworks */,
 				8D90274E21D800B700D0EC40 /* Curry.framework in Embed Frameworks */,
 			);
@@ -486,7 +480,6 @@
 				8D966E4C21C18425009AF6E6 /* Commandant.framework in Frameworks */,
 				8D966E4821C035C8009AF6E6 /* PrettyColors.framework in Frameworks */,
 				8D109A3821BC80D9007F2C30 /* SwiftyJSON.framework in Frameworks */,
-				8D966E5021C1859C009AF6E6 /* Result.framework in Frameworks */,
 				8D966E5821C19993009AF6E6 /* Curry.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -498,7 +491,6 @@
 				8D90274F21D800B700D0EC40 /* PrettyColors.framework in Frameworks */,
 				8D82DDC221F792DF0043F516 /* Sparkle.framework in Frameworks */,
 				8D90274B21D800B700D0EC40 /* Commandant.framework in Frameworks */,
-				8D90275121D800B700D0EC40 /* Result.framework in Frameworks */,
 				8D73C65621D1855C0021FA4B /* SwiftyJSON.framework in Frameworks */,
 				8D90274D21D800B700D0EC40 /* Curry.framework in Frameworks */,
 			);
@@ -1060,7 +1052,6 @@
 				"$(SRCROOT)/../Carthage/Build/Mac/SwiftyJSON.framework",
 				"$(SRCROOT)/../Carthage/Build/Mac/PrettyColors.framework",
 				"$(SRCROOT)/../Carthage/Build/Mac/Commandant.framework",
-				"$(SRCROOT)/../Carthage/Build/Mac/Result.framework",
 				"$(SRCROOT)/../Carthage/Build/Mac/Curry.framework",
 			);
 			name = "Carthage Frameworks Handling";
@@ -1070,7 +1061,6 @@
 				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Carthage/Build/Mac/SwiftyJSON.framework",
 				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Carthage/Build/Mac/PrettyColors.framework",
 				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Carthage/Build/Mac/Commandant.framework",
-				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Carthage/Build/Mac/Result.framework",
 				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Carthage/Build/Mac/Curry.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1381,7 +1371,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "cz.vookimedlo.coolmaster.hid.ck550-cli";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1401,7 +1390,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "cz.vookimedlo.coolmaster.hid.ck550-cli";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1420,7 +1408,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = cz.vookimedlo.coolmaster.hid.ck550;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -1439,7 +1426,6 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = cz.vookimedlo.coolmaster.hid.ck550;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -1503,6 +1489,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1559,6 +1546,7 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/src/cli/AboutCommand.swift b/src/cli/AboutCommand.swift
@@ -26,7 +26,6 @@
 
 import Foundation
 import Commandant
-import Result
 
 public struct AboutCommand: CommandProtocol {
     public let verb = "about"

diff --git a/src/cli/BreathingCommand.swift b/src/cli/BreathingCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct BreathingCommand: CommandProtocol {

diff --git a/src/cli/CircleSpectrumCommand.swift b/src/cli/CircleSpectrumCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct CircleSpectrumCommand: CommandProtocol {

diff --git a/src/cli/ColorCycleCommand.swift b/src/cli/ColorCycleCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct ColorCycleCommand: CommandProtocol {

diff --git a/src/cli/ComponentsCommand.swift b/src/cli/ComponentsCommand.swift
@@ -26,7 +26,6 @@
 
 import Foundation
 import Commandant
-import Result
 
 public struct ComponentsCommand: CommandProtocol {
     public let verb = "license-components"

diff --git a/src/cli/CustomizationCommand.swift b/src/cli/CustomizationCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct CustomizationCommand: CommandProtocol {

diff --git a/src/cli/FireballCommand.swift b/src/cli/FireballCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct FireballCommand: CommandProtocol {

diff --git a/src/cli/HeartbeatCommand.swift b/src/cli/HeartbeatCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct HeartbeatCommand: CommandProtocol {

diff --git a/src/cli/Info.plist b/src/cli/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2019.01.27</string>
+	<string>2019.05.07-dev</string>
 	<key>CFBundleVersion</key>
-	<string>20190127</string>
+	<string>20190507</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/cli/LicenseCommand.swift b/src/cli/LicenseCommand.swift
@@ -26,7 +26,6 @@
 
 import Foundation
 import Commandant
-import Result
 
 public struct LicenseCommand: CommandProtocol {
     public let verb = "license"

diff --git a/src/cli/MonitorCommand.swift b/src/cli/MonitorCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 
 public struct MonitorCommand: CommandProtocol {
     public let verb = "monitor"

diff --git a/src/cli/OffCommand.swift b/src/cli/OffCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct OffCommand: CommandProtocol {

diff --git a/src/cli/ReactivePunchCommand.swift b/src/cli/ReactivePunchCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct ReactivePunchCommand: CommandProtocol {

diff --git a/src/cli/ReactiveTornadoCommand.swift b/src/cli/ReactiveTornadoCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct ReactiveTornadoCommand: CommandProtocol {

diff --git a/src/cli/RippleCommand.swift b/src/cli/RippleCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct RippleCommand: CommandProtocol {

diff --git a/src/cli/SingleKeyCommand.swift b/src/cli/SingleKeyCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct SingleKeyCommand: CommandProtocol {

diff --git a/src/cli/SnowingCommand.swift b/src/cli/SnowingCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct SnowingCommand: CommandProtocol {

diff --git a/src/cli/StarsCommand.swift b/src/cli/StarsCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct StarsCommand: CommandProtocol {

diff --git a/src/cli/StaticCommand.swift b/src/cli/StaticCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct StaticCommand: CommandProtocol {

diff --git a/src/cli/VersionCommand.swift b/src/cli/VersionCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 
 public struct VersionCommand: CommandProtocol {
     public let verb = "version"

diff --git a/src/cli/WaterRippleCommand.swift b/src/cli/WaterRippleCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct WaterRippleCommand: CommandProtocol {

diff --git a/src/cli/WaveCommand.swift b/src/cli/WaveCommand.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 import Curry
 
 public struct WaveCommand: CommandProtocol {

diff --git a/src/cli/main.swift b/src/cli/main.swift
@@ -26,7 +26,6 @@ SOFTWARE.
 
 import Foundation
 import Commandant
-import Result
 
 /// Errors related to the CLI arguments.
 ///

diff --git a/src/gui/Info.plist b/src/gui/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2019.01.27</string>
+	<string>2019.05.07-dev</string>
 	<key>CFBundleVersion</key>
-	<string>20190127</string>
+	<string>20190507</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>