Upgrade to Swift 4

SteveBarnegren · Oct 19, 2017 · 5b6255f · 5b6255f
1 parent e2782cc
commit 5b6255f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -313,10 +313,12 @@
 					67A9CA131DE64DAA00510FB8 = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = VAA3W4LPY2;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					67A9CA261DE64DAA00510FB8 = {
 						CreatedOnToolsVersion = 8.0;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 67A9CA131DE64DAA00510FB8;
 					};
@@ -576,7 +578,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -595,7 +597,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -615,7 +617,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessExampleTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftChessExample.app/SwiftChessExample";
 			};
 			name = Debug;
@@ -633,7 +635,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessExampleTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftChessExample.app/SwiftChessExample";
 			};
 			name = Release;

diff --git a/Example/SwiftChess/GameViewController.swift b/Example/SwiftChess/GameViewController.swift
@@ -395,7 +395,7 @@ extension GameViewController: GameDelegate {
         updateCastleButtonsVisibility()
     }
 
-    func tellAIToTakeGo() {
+    @objc func tellAIToTakeGo() {
 
         if let player =  game.currentPlayer as? AIPlayer {
             activityIndicator.startAnimating();

diff --git a/Example/SwiftChess/PromotionSelectionViewController.swift b/Example/SwiftChess/PromotionSelectionViewController.swift
@@ -67,7 +67,7 @@ class PromotionSelectionViewController: UIViewController {
 
     // MARK: - Actions
 
-    func buttonPressed(sender: UIButton) {
+    @objc func buttonPressed(sender: UIButton) {
 
         let index = buttons.index(of: sender)!
         print("Button pressed at index: \(index)")

diff --git a/SwiftChess/SwiftChess.xcodeproj/project.pbxproj b/SwiftChess/SwiftChess.xcodeproj/project.pbxproj
@@ -251,10 +251,12 @@
 				TargetAttributes = {
 					67A9C9DD1DE64CD200510FB8 = {
 						CreatedOnToolsVersion = 8.0;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					67A9C9E61DE64CD300510FB8 = {
 						CreatedOnToolsVersion = 8.0;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -469,7 +471,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChess;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -487,7 +490,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChess;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -499,7 +503,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -511,7 +516,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = SteveBarnegren.SwiftChessTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};