From 71f0e90b4650656ab0e63035171766ac258d8b63 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Sat, 23 Sep 2017 13:04:11 +0200
Subject: [PATCH] Update to Swift 4 and Xcode 9
---
Pacman3D-iOS.xcodeproj/project.pbxproj | 35 +++++++++++++++----
.../xcschemes/Pacman3D-iOS.xcscheme | 4 ++-
Pacman3D-iOS/AppDelegate.swift | 2 +-
Pacman3D-iOS/GameViewController.swift | 2 +-
4 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/Pacman3D-iOS.xcodeproj/project.pbxproj b/Pacman3D-iOS.xcodeproj/project.pbxproj
index 85c89ba..50df323 100644
--- a/Pacman3D-iOS.xcodeproj/project.pbxproj
+++ b/Pacman3D-iOS.xcodeproj/project.pbxproj
@@ -266,23 +266,26 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
- LastUpgradeCheck = 0830;
+ LastUpgradeCheck = 0900;
ORGANIZATIONNAME = Tobias;
TargetAttributes = {
F6BEB8021EF7F99B00EDAA66 = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = GSS77QYM85;
+ LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
};
F6BEB8181EF7F99B00EDAA66 = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = GSS77QYM85;
+ LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
TestTargetID = F6BEB8021EF7F99B00EDAA66;
};
F6BEB8231EF7F99C00EDAA66 = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = GSS77QYM85;
+ LastSwiftMigration = 0900;
ProvisioningStyle = Automatic;
TestTargetID = F6BEB8021EF7F99B00EDAA66;
};
@@ -424,7 +427,9 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -432,7 +437,11 @@
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -475,7 +484,9 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -483,7 +494,11 @@
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -518,7 +533,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "de.tobias.Pacman3D-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
};
name = Debug;
};
@@ -531,7 +547,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "de.tobias.Pacman3D-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
};
name = Release;
};
@@ -545,7 +562,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "de.tobias.Pacman3D-iOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Pacman3D-iOS.app/Pacman3D-iOS";
};
name = Debug;
@@ -560,7 +578,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "de.tobias.Pacman3D-iOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Pacman3D-iOS.app/Pacman3D-iOS";
};
name = Release;
@@ -574,7 +593,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "de.tobias.Pacman3D-iOSUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
TEST_TARGET_NAME = "Pacman3D-iOS";
};
name = Debug;
@@ -588,7 +608,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "de.tobias.Pacman3D-iOSUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 3.0;
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
TEST_TARGET_NAME = "Pacman3D-iOS";
};
name = Release;
diff --git a/Pacman3D-iOS.xcodeproj/xcuserdata/tobias.xcuserdatad/xcschemes/Pacman3D-iOS.xcscheme b/Pacman3D-iOS.xcodeproj/xcuserdata/tobias.xcuserdatad/xcschemes/Pacman3D-iOS.xcscheme
index d06f49f..89384f6 100644
--- a/Pacman3D-iOS.xcodeproj/xcuserdata/tobias.xcuserdatad/xcschemes/Pacman3D-iOS.xcscheme
+++ b/Pacman3D-iOS.xcodeproj/xcuserdata/tobias.xcuserdatad/xcschemes/Pacman3D-iOS.xcscheme
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
- LastUpgradeVersion = "0830"
+ LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
@@ -65,6 +66,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
diff --git a/Pacman3D-iOS/AppDelegate.swift b/Pacman3D-iOS/AppDelegate.swift
index 424cb14..9110011 100644
--- a/Pacman3D-iOS/AppDelegate.swift
+++ b/Pacman3D-iOS/AppDelegate.swift
@@ -43,7 +43,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}
extension Array where Element: Equatable {
- mutating func remove(object : Generator.Element) {
+ mutating func remove(object : Iterator.Element) {
if let index = self.index(of: object) {
self.remove(at: index)
}
diff --git a/Pacman3D-iOS/GameViewController.swift b/Pacman3D-iOS/GameViewController.swift
index 56faf16..cd43dd1 100644
--- a/Pacman3D-iOS/GameViewController.swift
+++ b/Pacman3D-iOS/GameViewController.swift
@@ -300,7 +300,7 @@ class GameViewController: UIViewController, SKSceneDelegate, SCNPhysicsContactDe
}
- func handleTap(_ gestureRecognize: UIGestureRecognizer) {
+ @objc func handleTap(_ gestureRecognize: UIGestureRecognizer) {
}
override var shouldAutorotate: Bool {
--
GitLab