Update to Swift 5 (#9)

* Update to Swift 5 * Update podspec * Update Travis * Run pod install * Update changelog
BasThomas · Mar 27, 2019 · 34596ee · 34596ee
1 parent 6f6caf2
commit 34596ee
Show file tree

Hide file tree

Showing 20 changed files with 497 additions and 405 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
 language: swift
-osx_image: xcode10
+osx_image: xcode10.2
 script:
-  - xcodebuild clean test -workspace Example/ImageAlertAction.xcworkspace -scheme ImageAlertAction-Example -destination "platform=iOS Simulator,name=iPhone X,OS=12.0" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet
+  - xcodebuild clean test -workspace Example/ImageAlertAction.xcworkspace -scheme ImageAlertAction-Example -destination "platform=iOS Simulator,name=iPhone X,OS=12.2" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Next
 
+## 3.0.0
+
+- Updated to Swift 5.0
+
 ## 2.0.0
 
 - Updated to Swift 4.2

diff --git a/Example/ImageAlertAction.xcodeproj/project.pbxproj b/Example/ImageAlertAction.xcodeproj/project.pbxproj
@@ -172,7 +172,6 @@
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
 				A1CB783A469A79F75C2C0D0A /* [CP] Embed Pods Frameworks */,
-				2C0343649D3C06F415A5A140 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -191,8 +190,6 @@
 				607FACE11AFB9204008FA782 /* Sources */,
 				607FACE21AFB9204008FA782 /* Frameworks */,
 				607FACE31AFB9204008FA782 /* Resources */,
-				225EC59716E726C269D944A5 /* [CP] Embed Pods Frameworks */,
-				A4CEB215EE7DB774AE87041D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -211,23 +208,23 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
 			};
 			buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "ImageAlertAction" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -266,36 +263,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		225EC59716E726C269D944A5 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		2C0343649D3C06F415A5A140 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		4373DC80D597D901935FC03C /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -338,7 +305,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/ImageAlertAction/ImageAlertAction.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -347,22 +314,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		A4CEB215EE7DB774AE87041D /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -419,6 +371,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;
@@ -474,6 +427,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;
@@ -528,7 +482,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -542,7 +496,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -562,7 +516,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ImageAlertAction_Example.app/ImageAlertAction_Example";
 			};
 			name = Debug;
@@ -579,7 +533,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ImageAlertAction_Example.app/ImageAlertAction_Example";
 			};
 			name = Release;

diff --git a/Example/ImageAlertAction.xcodeproj/xcshareddata/xcschemes/ImageAlertAction-Example.xcscheme b/Example/ImageAlertAction.xcodeproj/xcshareddata/xcschemes/ImageAlertAction-Example.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/Podfile b/Example/Podfile
@@ -1,3 +1,5 @@
+platform :ios, '8.0'
+
 use_frameworks!
 
 target 'ImageAlertAction_Example' do

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - ImageAlertAction (1.0.0)
+  - ImageAlertAction (3.0.0)
 
 DEPENDENCIES:
   - ImageAlertAction (from `../`)
 
 EXTERNAL SOURCES:
   ImageAlertAction:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
-  ImageAlertAction: 303ff3a5535afd4f946ceabbdbda2fbcc0185255
+  ImageAlertAction: 11596c060c40a910006988b78e34012355a6fe7e
 
-PODFILE CHECKSUM: 141ea98584f2ff08d0219eae979497d4cccb2c82
+PODFILE CHECKSUM: 2861c5c31891940484aaf82fd18a1725282b6061
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.6.1
diff --git a/Example/Pods/Local Podspecs/ImageAlertAction.podspec.json b/Example/Pods/Local Podspecs/ImageAlertAction.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock