From 92d7225f5dac1711bcc591441ea89c0a0520de50 Mon Sep 17 00:00:00 2001 From: James Richard Date: Mon, 29 Apr 2019 17:20:22 -0700 Subject: [PATCH 1/5] Updates for Swift 5 --- Try.podspec | 4 ++-- Try.xcodeproj/project.pbxproj | 24 ++++++++++++------- .../xcshareddata/xcschemes/Try-macOS.xcscheme | 10 ++++---- .../xcshareddata/xcschemes/Try.xcscheme | 4 +--- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Try.podspec b/Try.podspec index 6018f9e..9d26c2e 100644 --- a/Try.podspec +++ b/Try.podspec @@ -13,8 +13,8 @@ handling system. s.osx.deployment_target = "10.9" s.watchos.deployment_target = "2.0" s.tvos.deployment_target = "9.0" - s.source = { :git => "https://github.com/Weebly/Try.git", :tag => "v2.1.0" } + s.source = { :git => "https://github.com/Weebly/Try.git", :tag => "v2.1.1" } s.source_files = "Try/trap.swift", "Try/WBTry.h", "Try/WBTry.m" s.requires_arc = true - s.swift_version = "4.0" + s.swift_version = "5.0" end diff --git a/Try.xcodeproj/project.pbxproj b/Try.xcodeproj/project.pbxproj index 0fc2552..357c087 100644 --- a/Try.xcodeproj/project.pbxproj +++ b/Try.xcodeproj/project.pbxproj @@ -140,25 +140,27 @@ 1AAD31751C651C6500825D28 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0920; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = Weebly; TargetAttributes = { 00DAEA84203E0B5400D451B6 = { CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1020; ProvisioningStyle = Manual; }; 1AAD317D1C651C6500825D28 = { CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0920; + LastSwiftMigration = 1020; }; }; }; buildConfigurationList = 1AAD31781C651C6500825D28 /* Build configuration list for PBXProject "Try" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 1AAD31741C651C6500825D28; productRefGroup = 1AAD317F1C651C6500825D28 /* Products */; @@ -238,7 +240,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -269,7 +271,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -277,6 +279,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; @@ -285,12 +288,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -333,6 +338,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; @@ -341,12 +347,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -395,8 +403,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -415,8 +422,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.Weebly.Try; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Try.xcodeproj/xcshareddata/xcschemes/Try-macOS.xcscheme b/Try.xcodeproj/xcshareddata/xcschemes/Try-macOS.xcscheme index 263e45b..0d8d94c 100644 --- a/Try.xcodeproj/xcshareddata/xcschemes/Try-macOS.xcscheme +++ b/Try.xcodeproj/xcshareddata/xcschemes/Try-macOS.xcscheme @@ -1,6 +1,6 @@ @@ -26,7 +26,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -48,7 +46,7 @@ @@ -66,7 +64,7 @@ diff --git a/Try.xcodeproj/xcshareddata/xcschemes/Try.xcscheme b/Try.xcodeproj/xcshareddata/xcschemes/Try.xcscheme index 57f8596..a1727f6 100644 --- a/Try.xcodeproj/xcshareddata/xcschemes/Try.xcscheme +++ b/Try.xcodeproj/xcshareddata/xcschemes/Try.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" From 4fd80a1d31aec50ee4a7572dc69b3bed04576ed3 Mon Sep 17 00:00:00 2001 From: James Richard Date: Mon, 29 Apr 2019 17:22:50 -0700 Subject: [PATCH 2/5] Update Travis config --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2535e32..a5658ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c -osx_image: xcode8 +osx_image: xcode10.2 xcode_projec: Try.xcodeproj xcode_scheme: Try -xcode_sdk: iphonesimulator10.0 +xcode_sdk: iphonesimulator12.2 From 3510cbbacff762d9fb078e3ff84c6e9ab74a789d Mon Sep 17 00:00:00 2001 From: James Richard Date: Mon, 29 Apr 2019 17:23:32 -0700 Subject: [PATCH 3/5] Add workspace checks --- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Try.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Try.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Try.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Try.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From 52a09e5d809618b40559cd69bf6b03527caa7a3a Mon Sep 17 00:00:00 2001 From: James Richard Date: Mon, 29 Apr 2019 17:27:14 -0700 Subject: [PATCH 4/5] Fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5658ad..916a789 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c osx_image: xcode10.2 -xcode_projec: Try.xcodeproj +xcode_project: Try.xcodeproj xcode_scheme: Try xcode_sdk: iphonesimulator12.2 From 98003897b157d16867a7ef48149f5faf12c3bb71 Mon Sep 17 00:00:00 2001 From: James Richard Date: Mon, 29 Apr 2019 17:36:40 -0700 Subject: [PATCH 5/5] Custom script to just build on travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 916a789..e03e151 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,4 @@ language: objective-c osx_image: xcode10.2 xcode_project: Try.xcodeproj xcode_scheme: Try -xcode_sdk: iphonesimulator12.2 - +script: xcodebuild -project Try.xcodeproj -target Try -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty