From 578f0fb5ddbe7872c1f2d466d7589f6727df9e6d Mon Sep 17 00:00:00 2001 From: Fachri Febrian Date: Thu, 9 Jan 2020 18:25:01 +0700 Subject: [PATCH] Migrate swift 5 --- .../project.pbxproj | 26 +++++++++---------- .../NVActivityIndicatorViewTests.xcscheme | 24 +++++++---------- Example/Podfile.lock | 4 +-- NVActivityIndicatorView.podspec | 2 +- 4 files changed, 25 insertions(+), 31 deletions(-) diff --git a/Example/NVActivityIndicatorViewExample.xcodeproj/project.pbxproj b/Example/NVActivityIndicatorViewExample.xcodeproj/project.pbxproj index 3f85ae18..dd98b9b0 100644 --- a/Example/NVActivityIndicatorViewExample.xcodeproj/project.pbxproj +++ b/Example/NVActivityIndicatorViewExample.xcodeproj/project.pbxproj @@ -188,17 +188,17 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1120; ORGANIZATIONNAME = "Vinh Nguyen"; TargetAttributes = { 1F0326F81F0D28CC00BF3358 = { CreatedOnToolsVersion = 8.3; - LastSwiftMigration = 0900; + LastSwiftMigration = 1120; ProvisioningStyle = Manual; }; 1F0327281F0D399E00BF3358 = { CreatedOnToolsVersion = 8.3; - LastSwiftMigration = 0900; + LastSwiftMigration = 1120; ProvisioningStyle = Manual; TestTargetID = 1F0326F81F0D28CC00BF3358; }; @@ -206,7 +206,7 @@ }; buildConfigurationList = 1F0326F41F0D28CC00BF3358 /* Build configuration list for PBXProject "NVActivityIndicatorViewExample" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -250,7 +250,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-NVActivityIndicatorViewExample/Pods-NVActivityIndicatorViewExample-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-NVActivityIndicatorViewExample/Pods-NVActivityIndicatorViewExample-frameworks.sh", "${BUILT_PRODUCTS_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.framework", ); name = "[CP] Embed Pods Frameworks"; @@ -259,7 +259,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-NVActivityIndicatorViewExample/Pods-NVActivityIndicatorViewExample-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NVActivityIndicatorViewExample/Pods-NVActivityIndicatorViewExample-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; C3A662686B21AB8B414FCDA2 /* [CP] Check Pods Manifest.lock */ = { @@ -286,7 +286,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-NVActivityIndicatorViewExample-NVActivityIndicatorViewTests/Pods-NVActivityIndicatorViewExample-NVActivityIndicatorViewTests-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-NVActivityIndicatorViewExample-NVActivityIndicatorViewTests/Pods-NVActivityIndicatorViewExample-NVActivityIndicatorViewTests-frameworks.sh", "${BUILT_PRODUCTS_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.framework", ); name = "[CP] Embed Pods Frameworks"; @@ -295,7 +295,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-NVActivityIndicatorViewExample-NVActivityIndicatorViewTests/Pods-NVActivityIndicatorViewExample-NVActivityIndicatorViewTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NVActivityIndicatorViewExample-NVActivityIndicatorViewTests/Pods-NVActivityIndicatorViewExample-NVActivityIndicatorViewTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; FC7EC3A272EE15625D0A4145 /* [CP] Check Pods Manifest.lock */ = { @@ -373,6 +373,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -424,7 +425,7 @@ SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -432,6 +433,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -475,7 +477,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; @@ -492,7 +494,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -508,7 +509,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; }; name = Release; }; @@ -527,7 +527,6 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NVActivityIndicatorViewExample.app/NVActivityIndicatorViewExample"; }; name = Debug; @@ -546,7 +545,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NVActivityIndicatorViewExample.app/NVActivityIndicatorViewExample"; }; name = Release; diff --git a/Example/NVActivityIndicatorViewExample.xcodeproj/xcshareddata/xcschemes/NVActivityIndicatorViewTests.xcscheme b/Example/NVActivityIndicatorViewExample.xcodeproj/xcshareddata/xcschemes/NVActivityIndicatorViewTests.xcscheme index 0db44822..507ce7a7 100644 --- a/Example/NVActivityIndicatorViewExample.xcodeproj/xcshareddata/xcschemes/NVActivityIndicatorViewTests.xcscheme +++ b/Example/NVActivityIndicatorViewExample.xcodeproj/xcshareddata/xcschemes/NVActivityIndicatorViewTests.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -53,17 +62,6 @@ - - - - - - - - "MIT", :file => "LICENSE" } s.author = { "Vinh Nguyen" => "ninjaprox@gmail.com" } s.social_media_url = "http://twitter.com/ninjaprox" - s.swift_version = "4.2" + s.swift_version = "5.0" s.ios.deployment_target = "8.0" s.tvos.deployment_target = "9.0"