From e3053d51bf23ee416a564d83fe5716d5be0d301c Mon Sep 17 00:00:00 2001 From: Ergun KOCAK Date: Thu, 20 Aug 2020 08:14:40 +0200 Subject: [PATCH 1/2] Swift 5 && DynamicColor 5 --- Example/Podfile | 4 +- Example/SnappingStepper/Info.plist | 2 +- .../project.pbxproj | 30 +++---- .../xcschemes/SnappingStepper.xcscheme | 6 +- .../xcschemes/SnappingStepperExample.xcscheme | 24 +++--- .../xcshareddata/xcschemes/Tests.xcscheme | 28 +++---- .../AppIcon.appiconset/Contents.json | 84 +++++++++++++------ SnappingStepper.podspec | 6 +- 8 files changed, 101 insertions(+), 83 deletions(-) diff --git a/Example/Podfile b/Example/Podfile index 938268e..45d288f 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,10 +1,10 @@ -platform :ios, '9.0' +platform :ios, '11.0' source 'https://github.com/CocoaPods/Specs.git' use_frameworks! def shared_pods - pod 'DynamicColor', '~> 4.0' + pod 'DynamicColor', '~> 5.0' end target 'SnappingStepper' do diff --git a/Example/SnappingStepper/Info.plist b/Example/SnappingStepper/Info.plist index e0f4bf7..1bcfa6d 100644 --- a/Example/SnappingStepper/Info.plist +++ b/Example/SnappingStepper/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.0.0 + 4.0.0 CFBundleSignature ???? CFBundleVersion diff --git a/Example/SnappingStepperExample.xcodeproj/project.pbxproj b/Example/SnappingStepperExample.xcodeproj/project.pbxproj index ca78af5..ba06d32 100644 --- a/Example/SnappingStepperExample.xcodeproj/project.pbxproj +++ b/Example/SnappingStepperExample.xcodeproj/project.pbxproj @@ -349,19 +349,20 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0710; - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1160; ORGANIZATIONNAME = "Yannick Loriot"; TargetAttributes = { CE6F72371AF513810019CB55 = { CreatedOnToolsVersion = 6.3; - LastSwiftMigration = 1000; + LastSwiftMigration = 1160; }; CE8FFEAE1BAB22C100D43F38 = { CreatedOnToolsVersion = 7.0; - LastSwiftMigration = 1000; + LastSwiftMigration = 1160; }; CEB21D5E1B18C169003E9EEC = { CreatedOnToolsVersion = 6.3.2; + LastSwiftMigration = 1160; TestTargetID = CE6F72371AF513810019CB55; }; }; @@ -371,6 +372,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -600,6 +602,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; @@ -643,7 +646,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -657,6 +660,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; @@ -693,7 +697,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -713,7 +717,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -727,7 +731,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -744,12 +748,11 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = SnappingStepper/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.SnappingStepper; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -767,12 +770,11 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = SnappingStepper/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.yannickloriot.SnappingStepper; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -794,11 +796,10 @@ "$(inherited)", ); INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SnappingStepperExample.app/SnappingStepperExample"; }; name = Debug; @@ -815,11 +816,10 @@ GCC_GENERATE_TEST_COVERAGE_FILES = YES; GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; INFOPLIST_FILE = Tests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.yannickloriot.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SnappingStepperExample.app/SnappingStepperExample"; }; name = Release; diff --git a/Example/SnappingStepperExample.xcodeproj/xcshareddata/xcschemes/SnappingStepper.xcscheme b/Example/SnappingStepperExample.xcodeproj/xcshareddata/xcschemes/SnappingStepper.xcscheme index fea5b60..d2bf429 100644 --- a/Example/SnappingStepperExample.xcodeproj/xcshareddata/xcschemes/SnappingStepper.xcscheme +++ b/Example/SnappingStepperExample.xcodeproj/xcshareddata/xcschemes/SnappingStepper.xcscheme @@ -1,6 +1,6 @@ - - - - + + + + @@ -87,17 +96,6 @@ - - - - - - - - + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> + + + + @@ -54,17 +63,6 @@ - - - - - - - - 'contact@yannickloriot.com' } s.source = { :git => 'https://github.com/yannickl/SnappingStepper.git', :tag => s.version } s.screenshot = 'http://yannickloriot.com/resources/snappingstepper-screenshot.png' - s.swift_version = '4.2' + s.swift_version = '5.0' s.ios.deployment_target = '8.0' - s.dependency 'DynamicColor', '~> 4.0' + s.dependency 'DynamicColor', '~> 5.0' s.framework = 'UIKit' s.source_files = 'Sources/*.swift' From b0d7080a400409e7beaf23e96f53ad8eade82daa Mon Sep 17 00:00:00 2001 From: Ergun KOCAK Date: Thu, 20 Aug 2020 08:16:49 +0200 Subject: [PATCH 2/2] Swift version 5 --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index bf77d54..819e07a 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.2 +5.0