Update demo to swift 5

onmyway133 · May 3, 2019 · 76aa109 · 76aa109
1 parent 94f8270
commit 76aa109
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 48 deletions.
diff --git a/Example/Benchmark/Benchmark.xcodeproj/project.pbxproj b/Example/Benchmark/Benchmark.xcodeproj/project.pbxproj
@@ -292,7 +292,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -344,7 +344,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -361,7 +361,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.onmyway133.Benchmark;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -378,7 +377,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.onmyway133.Benchmark;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Example/Benchmark/Benchmark/AppDelegate.swift b/Example/Benchmark/Benchmark/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
   var window: UIWindow?
 
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    internal func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     // Override point for customization after application launch.
     return true
   }

diff --git a/Example/Benchmark/Podfile.lock b/Example/Benchmark/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - Changeset (3.0)
-  - DeepDiff (2.0.0)
+  - DeepDiff (2.2.0)
   - Differ (1.0.3)
   - Dwifft (0.8)
   - ListDiff (0.1.0)
@@ -25,11 +25,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Changeset: cbb84a74639049a7b96fc64851e8a9cfcc3c9989
-  DeepDiff: a3e7589c6b0b26fd042254a5aa7c4e1102151bdb
+  DeepDiff: e329bc46dd14ca788d8ec08d34420799ba1d77f2
   Differ: 0c220ac75542f5f17f91b1303b85bf07d871ecd7
   Dwifft: 463e61d07322fdf83b32ee6975ca1b20708db746
   ListDiff: 8a29c2ae3c8370cc989b6d6d50bb40d58c4e9ede
 
 PODFILE CHECKSUM: 59723220655512645b381c37f63e9627012758a1
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.0.beta.3
diff --git a/Example/DeepDiffDemo/DeepDiffDemo.xcodeproj/project.pbxproj b/Example/DeepDiffDemo/DeepDiffDemo.xcodeproj/project.pbxproj
@@ -160,19 +160,19 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Hyper Interaktiv AS";
 				TargetAttributes = {
 					D5C7F73F1C3BC9CE008CDDBA = {
 						CreatedOnToolsVersion = 7.2;
-						DevelopmentTeam = 456T4LX972;
+						DevelopmentTeam = T78DK947F2;
 						LastSwiftMigration = 0800;
 					};
 				};
 			};
 			buildConfigurationList = D5C7F73B1C3BC9CE008CDDBA /* Build configuration list for PBXProject "DeepDiffDemo" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -206,16 +206,12 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-DeepDiffDemo/Pods-DeepDiffDemo-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Anchors/Anchors.framework",
 				"${BUILT_PRODUCTS_DIR}/DeepDiff/DeepDiff.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Anchors.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DeepDiff.framework",
@@ -283,6 +279,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -330,14 +327,15 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		D5C7F7511C3BC9CE008CDDBA /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -378,7 +376,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -388,7 +386,7 @@
 			baseConfigurationReference = 312A6379467401DAF6A566F0 /* Pods-DeepDiffDemo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 456T4LX972;
+				DEVELOPMENT_TEAM = T78DK947F2;
 				INFOPLIST_FILE = DeepDiffDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.fantageek.DeepDiffDemo;
@@ -402,7 +400,7 @@
 			baseConfigurationReference = 9381C3F3F924D4469B231A2E /* Pods-DeepDiffDemo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 456T4LX972;
+				DEVELOPMENT_TEAM = T78DK947F2;
 				INFOPLIST_FILE = DeepDiffDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.fantageek.DeepDiffDemo;

diff --git a/Example/DeepDiffDemo/DeepDiffDemo.xcodeproj/xcshareddata/xcschemes/DeepDiffDemo.xcscheme b/Example/DeepDiffDemo/DeepDiffDemo.xcodeproj/xcshareddata/xcschemes/DeepDiffDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/DeepDiffDemo/Podfile.lock b/Example/DeepDiffDemo/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
-  - Anchors (2.4.0)
-  - DeepDiff (2.0.0)
+  - Anchors (2.5.0)
+  - DeepDiff (2.2.0)
 
 DEPENDENCIES:
   - Anchors
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  Anchors: 75614cac462e063b395386e31eb593a856d831a8
-  DeepDiff: a3e7589c6b0b26fd042254a5aa7c4e1102151bdb
+  Anchors: c039992ebab2fa53deccac429031a46debfbdc5a
+  DeepDiff: e329bc46dd14ca788d8ec08d34420799ba1d77f2
 
-PODFILE CHECKSUM: 8185e898622e6e2d8f7c1a10380fbcd698300e22
+PODFILE CHECKSUM: 944cff9288676684ea5bc7da8f78378a41eda706
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.0.beta.3
diff --git a/Example/DeepDiffTexture/DeepDiffTexture.xcodeproj/project.pbxproj b/Example/DeepDiffTexture/DeepDiffTexture.xcodeproj/project.pbxproj
@@ -174,26 +174,11 @@
 			files = (
 			);
 			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-DeepDiffTexture/Pods-DeepDiffTexture-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/Anchors/Anchors.framework",
-				"${BUILT_PRODUCTS_DIR}/DeepDiff/DeepDiff.framework",
-				"${BUILT_PRODUCTS_DIR}/PINCache/PINCache.framework",
-				"${BUILT_PRODUCTS_DIR}/PINOperation/PINOperation.framework",
-				"${BUILT_PRODUCTS_DIR}/PINRemoteImage/PINRemoteImage.framework",
-				"${BUILT_PRODUCTS_DIR}/Texture/AsyncDisplayKit.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-DeepDiffTexture/Pods-DeepDiffTexture-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Anchors.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DeepDiff.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINCache.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINOperation.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINRemoteImage.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AsyncDisplayKit.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-DeepDiffTexture/Pods-DeepDiffTexture-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

diff --git a/Example/DeepDiffTexture/Podfile.lock b/Example/DeepDiffTexture/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
-  - Anchors (2.4.0)
-  - DeepDiff (2.0.0)
+  - Anchors (2.5.0)
+  - DeepDiff (2.2.0)
   - PINCache (3.0.1-beta.6):
     - PINCache/Arc-exception-safe (= 3.0.1-beta.6)
     - PINCache/Core (= 3.0.1-beta.6)
@@ -42,13 +42,13 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  Anchors: 75614cac462e063b395386e31eb593a856d831a8
-  DeepDiff: a3e7589c6b0b26fd042254a5aa7c4e1102151bdb
+  Anchors: c039992ebab2fa53deccac429031a46debfbdc5a
+  DeepDiff: e329bc46dd14ca788d8ec08d34420799ba1d77f2
   PINCache: d195fdba255283f7e9900a55e3cced377f431f9b
   PINOperation: a6219e6fc9db9c269eb7a7b871ac193bcf400aac
   PINRemoteImage: d6d51c5d2adda55f1ce30c96e850b6c4ebd2856a
   Texture: 9d7e38965cf22ccd7cd9c249dd78b3f14e70ab6c
 
 PODFILE CHECKSUM: 317e16bd2e833f10896dad1c9e447a82a97b0e37
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.0.beta.3