From 768ad3bf2b8910dec5396b4c5fe35f90e4a6d4d0 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Sat, 6 Apr 2019 17:17:27 -0400 Subject: [PATCH] Carthage Xcode 10.2 support --- .travis.yml | 56 +++++++++++-------- Cartfile | 2 +- Cartfile.resolved | 2 +- PMKHealthKit.xcodeproj/project.pbxproj | 19 ++++--- .../xcschemes/PMKHealthKit.xcscheme | 2 +- 5 files changed, 47 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index a25ed32..91caf3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +osx_image: xcode10.2 +language: swift +os: osx + branches: only: - master @@ -10,11 +14,9 @@ jobs: stage: lint osx_image: xcode8.3 env: SWIFT=3.1 - name: pod lib lint --swift-version=3.1 - os: osx - language: objective-c + cache: cocoapods before_install: - gem install cocoapods --prerelease --version 1.6.0.beta.2 + gem install cocoapods --prerelease --version 1.7.0.beta.3 install: carthage bootstrap --no-build PromiseKit script: | @@ -26,41 +28,49 @@ jobs: - <<: *pod osx_image: xcode9.2 env: SWIFT=3.2 - name: pod lib lint --swift-version=3.2 - <<: *pod osx_image: xcode9.4 env: SWIFT=3.3 - name: pod lib lint --swift-version=3.3 - <<: *pod osx_image: xcode10.1 env: SWIFT=3.4 - name: pod lib lint --swift-version=3.4 - <<: *pod osx_image: xcode9.2 env: SWIFT=4.0 - name: pod lib lint --swift-version=4.0 - <<: *pod osx_image: xcode9.4 env: SWIFT=4.1 - name: pod lib lint --swift-version=4.1 - <<: *pod osx_image: xcode10.1 env: SWIFT=4.2 - name: pod lib lint --swift-version=4.2 + - <<: *pod + osx_image: xcode10.2 + env: SWIFT=4.3 + - <<: *pod + osx_image: xcode10.2 + env: SWIFT=5.0 - - stage: test + - &carthage + stage: carthage + osx_image: xcode9.2 + script: | + carthage bootstrap --cache-builds --platform iOS,macOS + sed -i '' "s/SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;/SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;/" *.xcodeproj/project.pbxproj + carthage build --no-skip-current + cache.directories: + - Carthage + - <<: *carthage + osx_image: xcode9.4 + - <<: *carthage osx_image: xcode10.1 - name: macOS Tests - env: DST='OS=12.0,name=iPhone SE' PLAT=iOS - os: osx - language: objective-c - cache: - directories: + - <<: *carthage + osx_image: xcode10.2 + + - stage: test + xcode_scheme: PMKHealthKit + xcode_project: PMKHealthKit.xcodeproj + xcode_destination: 'platform=iOS Simulator,OS=12.2,name=iPhone SE' + cache.directories: - Carthage before_install: - carthage bootstrap --cache-builds --no-use-binaries --platform $PLAT - install: - xcodebuild -scheme PMKHealthKit -target PMKHealthKit -quiet -destination "$DST" SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build - script: - xcodebuild -scheme PMKHealthKit -quiet -destination "$DST" test - name: iOS Tests + carthage bootstrap --cache-builds --no-use-binaries diff --git a/Cartfile b/Cartfile index 2bfea98..d4703e9 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "mxcl/PromiseKit" ~> 6.0 +github "mxcl/PromiseKit" ~> 6.8.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 6d72294..f54bbdb 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "mxcl/PromiseKit" "6.6.0" +github "mxcl/PromiseKit" "6.8.4" diff --git a/PMKHealthKit.xcodeproj/project.pbxproj b/PMKHealthKit.xcodeproj/project.pbxproj index ce31745..8d56387 100644 --- a/PMKHealthKit.xcodeproj/project.pbxproj +++ b/PMKHealthKit.xcodeproj/project.pbxproj @@ -143,27 +143,28 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0800; - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Max Howell"; TargetAttributes = { 63C7FFA61D5BEE09003BAE60 = { CreatedOnToolsVersion = 8.0; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; 63C7FFF11D5C020D003BAE60 = { CreatedOnToolsVersion = 8.0; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; }; }; buildConfigurationList = 63C7FFA11D5BEE09003BAE60 /* Build configuration list for PBXProject "PMKHealthKit" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 63C7FF9D1D5BEE09003BAE60; productRefGroup = 63C7FFA81D5BEE09003BAE60 /* Products */; @@ -227,6 +228,7 @@ baseConfigurationReference = 63CCF8171D5C11B500503216 /* Carthage.xcconfig */; 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++"; @@ -281,7 +283,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchsimulator watchos"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2,3,4"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -295,6 +297,7 @@ baseConfigurationReference = 63CCF8171D5C11B500503216 /* Carthage.xcconfig */; 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++"; @@ -341,7 +344,7 @@ PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.Foundation; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchsimulator watchos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2,3,4"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; @@ -365,6 +368,7 @@ PRODUCT_MODULE_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; }; name = Debug; }; @@ -381,6 +385,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_MODULE_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; }; name = Release; }; @@ -394,7 +399,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SUPPRESS_WARNINGS = YES; - SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -407,7 +411,6 @@ "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SUPPRESS_WARNINGS = YES; - SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/PMKHealthKit.xcodeproj/xcshareddata/xcschemes/PMKHealthKit.xcscheme b/PMKHealthKit.xcodeproj/xcshareddata/xcschemes/PMKHealthKit.xcscheme index 70a615b..53cd104 100644 --- a/PMKHealthKit.xcodeproj/xcshareddata/xcschemes/PMKHealthKit.xcscheme +++ b/PMKHealthKit.xcodeproj/xcshareddata/xcschemes/PMKHealthKit.xcscheme @@ -1,6 +1,6 @@