Merge pull request romansorochak#6 from Immoweb/swift-4

Update to Swift 4
truhoada · Sep 26, 2017 · 43330d9 · 43330d9
2 parents 2f71445 + 7146490
commit 43330d9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+4.0
diff --git a/ParallaxHeader.xcodeproj/project.pbxproj b/ParallaxHeader.xcodeproj/project.pbxproj
@@ -434,7 +434,7 @@
 					B5CCB78C1EFD0E5400194CFB = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = SWXVWAU9H9;
-						LastSwiftMigration = 0830;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					B5CCB7951EFD0E5500194CFB = {
@@ -445,11 +445,13 @@
 					B5CCB7AA1EFD0F2300194CFB = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = SWXVWAU9H9;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					B5CCB7BD1EFD0F2300194CFB = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = SWXVWAU9H9;
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 						TestTargetID = B5CCB7AA1EFD0F2300194CFB;
 					};
@@ -523,13 +525,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Exmple-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		383E94231D2D333DBB6D5C66 /* [CP] Copy Pods Resources */ = {
@@ -553,9 +558,14 @@
 			files = (
 			);
 			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Exmple/Pods-Exmple-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/RSReusable/Reusable.framework",
+				"${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reusable.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -768,7 +778,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -790,7 +801,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.magiclab.ParallaxHeader;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -833,7 +845,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.magiclab.Exmple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -849,7 +862,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.magiclab.Exmple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -863,7 +877,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.magiclab.ExmpleTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Exmple.app/Exmple";
 			};
 			name = Debug;
@@ -878,7 +893,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.magiclab.ExmpleTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Exmple.app/Exmple";
 			};
 			name = Release;

diff --git a/ParallaxHeader/ParallaxHeader.swift b/ParallaxHeader/ParallaxHeader.swift
@@ -270,7 +270,7 @@ public class ParallaxHeader: NSObject {
             "v" : view
         ]
         let metrics = [
-            "highPriority" : UILayoutPriorityDefaultHigh,
+            "highPriority" : UILayoutPriority.defaultHigh,
             "height" : height
             ] as [String : Any]
         contentView.addConstraints(
@@ -333,7 +333,7 @@ public class ParallaxHeader: NSObject {
             "v" : view
         ]
         let metrics = [
-            "highPriority" : UILayoutPriorityDefaultHigh,
+            "highPriority" : UILayoutPriority.defaultHigh,
             "height" : height
             ] as [String : Any]
         contentView.addConstraints(
@@ -407,7 +407,7 @@ public class ParallaxHeader: NSObject {
             "v" : view
         ]
         let metrics = [
-            "highPriority" : UILayoutPriorityDefaultHigh,
+            "highPriority" : UILayoutPriority.defaultHigh,
             "height" : height
             ] as [String : Any]
         contentView.addConstraints(

diff --git a/Podfile.lock b/Podfile.lock
@@ -12,4 +12,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 3c522e1f0f4d68a6e342b12a8c2de173654d2cf8
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.3.1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 3c522e1f0f4d68a6e342b12a8c2de173654d2cf8

		COCOAPODS: 1.2.0
		COCOAPODS: 1.3.1