From 9cb75f5eb39f5b5bf24a763dd1c5992347966666 Mon Sep 17 00:00:00 2001 From: Jimmy Ti Date: Mon, 9 Sep 2019 17:27:55 +1000 Subject: [PATCH] Upgrade to Swift 5.0 - Update deployment target to iOS 9.0 --- Cartfile | 2 +- Cartfile.resolved | 2 +- Example/Example.xcodeproj/project.pbxproj | 12 ++++++------ GenericPasswordRow.podspec | 4 ++-- GenericPasswordRow.xcodeproj/project.pbxproj | 12 ++++++------ Resources/GenericPasswordCell.xib | 7 +++---- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Cartfile b/Cartfile index ec2bbb1..299dd1b 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "xmartlabs/Eureka" ~> 4.0 +github "xmartlabs/Eureka" ~> 5.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 9b29d54..cc733b0 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "xmartlabs/Eureka" "4.0.0" +github "xmartlabs/Eureka" "5.0.0" diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index fa6501b..6a2108c 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -466,7 +466,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.Example; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -482,7 +482,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.Example; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -494,7 +494,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.ExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example"; }; name = Debug; @@ -507,7 +507,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.ExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example"; }; name = Release; @@ -519,7 +519,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.ExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_TARGET_NAME = Example; }; name = Debug; @@ -531,7 +531,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.ExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_TARGET_NAME = Example; }; name = Release; diff --git a/GenericPasswordRow.podspec b/GenericPasswordRow.podspec index 2ac2a0d..6cad704 100644 --- a/GenericPasswordRow.podspec +++ b/GenericPasswordRow.podspec @@ -6,7 +6,7 @@ Pod::Spec.new do |spec| spec.license = { type: 'MIT', file: 'LICENSE' } spec.authors = { "Diego Ernst" => 'dernst@xmartlabs.com' } - spec.platform = :ios, "8.0" + spec.platform = :ios, "9.0" spec.requires_arc = true spec.source = { git: "https://github.com/EurekaCommunity/GenericPasswordRow.git", tag: "#{spec.version}", submodules: true } spec.ios.source_files = 'Sources/**/*.swift' @@ -14,5 +14,5 @@ Pod::Spec.new do |spec| 'GenericPasswordRow' => ['Resources/*'] } spec.ios.frameworks = 'UIKit', 'Foundation' - spec.dependency "Eureka", "~> 4.0" + spec.dependency "Eureka", "~> 5.0" end diff --git a/GenericPasswordRow.xcodeproj/project.pbxproj b/GenericPasswordRow.xcodeproj/project.pbxproj index 8b78a65..ca7b853 100644 --- a/GenericPasswordRow.xcodeproj/project.pbxproj +++ b/GenericPasswordRow.xcodeproj/project.pbxproj @@ -420,13 +420,13 @@ ); INFOPLIST_FILE = GenericPasswordRow/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.GenericPasswordRow; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -446,12 +446,12 @@ ); INFOPLIST_FILE = GenericPasswordRow/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.GenericPasswordRow; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -463,7 +463,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.GenericPasswordRowTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -475,7 +475,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.eureka.GenericPasswordRow.GenericPasswordRowTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Resources/GenericPasswordCell.xib b/Resources/GenericPasswordCell.xib index cbe3ff7..04263ec 100644 --- a/Resources/GenericPasswordCell.xib +++ b/Resources/GenericPasswordCell.xib @@ -1,12 +1,11 @@ - + - - - + +