From 5ffe20777cf0c8d60d555ac3bfc562185d1a8fcc Mon Sep 17 00:00:00 2001 From: Max Howell Date: Wed, 20 Jun 2018 03:49:43 +0000 Subject: [PATCH] Bump travis platform versions & Cartfile.resolved --- .travis.yml | 19 ++++++++++++------- Cartfile.resolved | 2 +- PMKAssetsLibrary.xcodeproj/project.pbxproj | 18 +++++++++++------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../xcschemes/PMKAssetsLibrary.xcscheme | 8 +++----- 5 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 PMKAssetsLibrary.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.travis.yml b/.travis.yml index 3616663..eb88103 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,17 +2,22 @@ os: osx language: objective-c matrix: include: - - {osx_image: xcode8.3, env: 'SWFT=3.1 DST="OS=10.3.1,name=iPhone SE"'} - - {osx_image: xcode9.2, env: 'SWFT=3.2 DST="OS=11.2,name=iPhone SE"'} - - {osx_image: xcode9.3beta, env: 'SWFT=3.3 DST="OS=11.3,name=iPhone SE"'} - - {osx_image: xcode9.2, env: 'SWFT=4.0 DST="OS=11.2,name=iPhone SE"'} - - {osx_image: xcode9.3beta, env: 'SWFT=4.1 DST="OS=11.3,name=iPhone SE"'} + - {osx_image: xcode8.3, env: 'SWFT=3.1 DST="OS=10.3.1,name=iPhone SE"'} + - {osx_image: xcode9.2, env: 'SWFT=3.2 DST="OS=11.2,name=iPhone SE"'} + - {osx_image: xcode9.4, env: 'SWFT=3.3 DST="OS=11.4,name=iPhone 5s"'} + - {osx_image: xcode9.2, env: 'SWFT=4.0 DST="OS=11.2,name=iPhone SE"'} + - {osx_image: xcode9.4, env: 'SWFT=4.1 DST="OS=11.4,name=iPhone 5s" TEST=1'} cache: directories: - Carthage before_install: - carthage bootstrap --cache-builds --no-use-binaries --platform iOS --verbose install: - - xcodebuild -scheme PMKAssetsLibrary -quiet -destination "$DST" SWIFT_VERSION=$SWFT build-for-testing + - xcodebuild -scheme PMKAssetsLibrary -target PMKAssetsLibrary -quiet -destination "$DST" SWIFT_VERSION=$SWFT SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build + - if [[ $TEST == "1" ]]; then + xcodebuild -scheme PMKAssetsLibrary -target PMKALTests -quiet -destination "$DST" build; + fi script: - - xcodebuild -scheme PMKAssetsLibrary -quiet -destination "$DST" test + - if [ "$TEST" == "1" ]; then + xcodebuild -scheme PMKAssetsLibrary -quiet -destination "$DST" test; + fi diff --git a/Cartfile.resolved b/Cartfile.resolved index 7e43117..a1be206 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "mxcl/PromiseKit" "6.1.0" +github "mxcl/PromiseKit" "6.3.3" diff --git a/PMKAssetsLibrary.xcodeproj/project.pbxproj b/PMKAssetsLibrary.xcodeproj/project.pbxproj index c2c50b2..e60c153 100644 --- a/PMKAssetsLibrary.xcodeproj/project.pbxproj +++ b/PMKAssetsLibrary.xcodeproj/project.pbxproj @@ -207,7 +207,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0800; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Max Howell"; TargetAttributes = { 630B2DFF1D5D0AF500DC10E9 = { @@ -330,7 +330,7 @@ SWIFT_INSTALL_OBJC_HEADER = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SUPPRESS_WARNINGS = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TEST_TARGET_NAME = PMKALTestsHost; }; name = Debug; @@ -348,7 +348,7 @@ PROVISIONING_PROFILE = ""; SWIFT_INSTALL_OBJC_HEADER = NO; SWIFT_SUPPRESS_WARNINGS = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TEST_TARGET_NAME = PMKALTestsHost; }; name = Release; @@ -368,6 +368,7 @@ 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_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -375,6 +376,7 @@ 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; @@ -411,6 +413,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2,3,4"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -434,6 +437,7 @@ 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_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -441,6 +445,7 @@ 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; @@ -469,6 +474,7 @@ PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.UIKit; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2,3,4"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; @@ -492,7 +498,6 @@ PRODUCT_MODULE_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -509,7 +514,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_MODULE_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Release; }; @@ -528,7 +532,7 @@ SDKROOT = iphoneos; SWIFT_INSTALL_OBJC_HEADER = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -546,7 +550,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_INSTALL_OBJC_HEADER = NO; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/PMKAssetsLibrary.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/PMKAssetsLibrary.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/PMKAssetsLibrary.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/PMKAssetsLibrary.xcodeproj/xcshareddata/xcschemes/PMKAssetsLibrary.xcscheme b/PMKAssetsLibrary.xcodeproj/xcshareddata/xcschemes/PMKAssetsLibrary.xcscheme index d4a756c..9539598 100644 --- a/PMKAssetsLibrary.xcodeproj/xcshareddata/xcschemes/PMKAssetsLibrary.xcscheme +++ b/PMKAssetsLibrary.xcodeproj/xcshareddata/xcschemes/PMKAssetsLibrary.xcscheme @@ -1,13 +1,13 @@ + buildImplicitDependencies = "NO">