From cf09c1970c7b1f33d781db893310bb5f67b9f044 Mon Sep 17 00:00:00 2001 From: Jimmy Ti Date: Sat, 26 Oct 2019 15:38:42 +1000 Subject: [PATCH 1/3] Update project to recommended build settings for Xcode 10.3 --- FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj | 6 ++++-- .../xcshareddata/xcschemes/FaveButton.xcscheme | 2 +- .../xcshareddata/xcschemes/FaveButtonDemo.xcscheme | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj b/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj index aa6adb5..145acd3 100644 --- a/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj +++ b/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj @@ -231,7 +231,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1030; ORGANIZATIONNAME = "Jansel Valentin"; TargetAttributes = { 26FEF3241D0E158100D75731 = { @@ -248,7 +248,7 @@ }; buildConfigurationList = 26FEF3201D0E158100D75731 /* Build configuration list for PBXProject "FaveButtonDemo" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -353,6 +353,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -408,6 +409,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; diff --git a/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButton.xcscheme b/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButton.xcscheme index 9f6f0f3..f79ff43 100644 --- a/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButton.xcscheme +++ b/FaveButtonDemo/FaveButtonDemo.xcodeproj/xcshareddata/xcschemes/FaveButton.xcscheme @@ -1,6 +1,6 @@ Date: Sat, 26 Oct 2019 15:39:14 +1000 Subject: [PATCH 2/3] Migrate project to Swift 5.0 --- .../FaveButtonDemo.xcodeproj/project.pbxproj | 16 ++++++---------- FaveButtonDemo/FaveButtonDemo/AppDelegate.swift | 2 +- Source/Ring.swift | 14 +++++++------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj b/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj index 145acd3..3a4b9db 100644 --- a/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj +++ b/FaveButtonDemo/FaveButtonDemo.xcodeproj/project.pbxproj @@ -237,12 +237,12 @@ 26FEF3241D0E158100D75731 = { CreatedOnToolsVersion = 7.3.1; DevelopmentTeam = 9T9Q2EVV88; - LastSwiftMigration = 0900; + LastSwiftMigration = 1030; }; 26FEF33E1D0E159B00D75731 = { CreatedOnToolsVersion = 7.3.1; DevelopmentTeam = 9T9Q2EVV88; - LastSwiftMigration = 0900; + LastSwiftMigration = 1030; }; }; }; @@ -469,8 +469,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xhamr.DemoFaveButton; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -488,8 +487,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xhamr.DemoFaveButton; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -511,8 +509,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -536,8 +533,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xhamr.FaveButton; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; diff --git a/FaveButtonDemo/FaveButtonDemo/AppDelegate.swift b/FaveButtonDemo/FaveButtonDemo/AppDelegate.swift index 6baf4bd..e7d5d4d 100644 --- a/FaveButtonDemo/FaveButtonDemo/AppDelegate.swift +++ b/FaveButtonDemo/FaveButtonDemo/AppDelegate.swift @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/Source/Ring.swift b/Source/Ring.swift index 3f167cd..4f6da8c 100644 --- a/Source/Ring.swift +++ b/Source/Ring.swift @@ -162,7 +162,7 @@ extension Ring{ #if swift(>=4.2) $0.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) #else - $0.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) + $0.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) #endif } @@ -180,8 +180,8 @@ extension Ring{ $0.fillMode = CAMediaTimingFillMode.forwards $0.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) #else - $0.fillMode = kCAFillModeForwards - $0.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) + $0.fillMode = CAMediaTimingFillMode.forwards + $0.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) #endif $0.isRemovedOnCompletion = false @@ -200,8 +200,8 @@ extension Ring{ $0.fillMode = CAMediaTimingFillMode.forwards $0.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) #else - $0.fillMode = kCAFillModeForwards - $0.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) + $0.fillMode = CAMediaTimingFillMode.forwards + $0.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) #endif } return animation @@ -220,8 +220,8 @@ extension Ring{ $0.fillMode = CAMediaTimingFillMode.forwards $0.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) #else - $0.fillMode = kCAFillModeForwards - $0.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseOut) + $0.fillMode = CAMediaTimingFillMode.forwards + $0.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeOut) #endif } return animation From 3d0287a8127f6dfad1177c3236afc18e88710bd5 Mon Sep 17 00:00:00 2001 From: Jimmy Ti Date: Sat, 26 Oct 2019 15:41:01 +1000 Subject: [PATCH 3/3] Update Travis configuration to adopt Xcode 10.3 and Swift 5.0 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 799053e..13e05d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode9.2 +osx_image: xcode10.3 # xcode_project: FaveButtonDemo/FaveButtonDemo.xcodeproj # xcode_scheme: FaveButton @@ -14,4 +14,4 @@ script: - xcodebuild -project FaveButtonDemo/FaveButtonDemo.xcodeproj -scheme "FaveButton" -sdk iphonesimulator11.2 -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c -# SWIFT_VERSION: 4.0 +# SWIFT_VERSION: 5.0