Merge pull request #2 from PromiseKit/carthage-xcode-10.2

Carthage Xcode 10.2 support

.travis.yml

@@ -1,39 +1,78 @@
+osx_image: xcode10.2
+language: swift
 os: osx
-language: objective-c
-matrix:
-  include:
-    - {osx_image: xcode8.3,   env: 'PLAT=iOS      SWFT=3.1  DST="OS=10.3.1,name=iPhone SE"'}
-    - {osx_image: xcode8.3,   env: 'PLAT=watchOS  SWFT=3.1  DST="OS=3.2,name=Apple Watch - 38mm"'}
 
-    - {osx_image: xcode9.2,   env: 'PLAT=iOS      SWFT=3.2  DST="OS=11.2,name=iPhone SE"'}
-    - {osx_image: xcode9.2,   env: 'PLAT=watchOS  SWFT=3.2  DST="OS=4.2,name=Apple Watch - 38mm"'}
-
-    - {osx_image: xcode9.4,   env: 'PLAT=iOS      SWFT=3.3  DST="OS=11.4,name=iPhone 5s"'}
-    - {osx_image: xcode9.4,   env: 'PLAT=watchOS  SWFT=3.3  DST="OS=4.3,name=Apple Watch - 38mm"'}
+branches:
+  only: 
+    - master
+stages:
+  - lint
+  - carthage
+  - test
+jobs:
+  include:
+    - &pod
+      stage: lint
+      osx_image: xcode8.3
+      env: SWIFT=3.1
+      cache: cocoapods
+      before_install:
+        gem install cocoapods --prerelease --version 1.7.0.beta.3
+      install:
+        carthage bootstrap --no-build PromiseKit
+      script: |
+        cd Carthage/Checkouts/PromiseKit
+        mv .github/PromiseKit.podspec .
+        rm -rf Extensions/WatchConnectivity/Sources
+        cp -R ../../../Sources Extensions/WatchConnectivity
+        pod lib lint --subspec=PromiseKit/WatchConnectivity --fail-fast --swift-version=$SWIFT
+    - <<: *pod
+      osx_image: xcode9.2
+      env: SWIFT=3.2
+    - <<: *pod
+      osx_image: xcode9.4
+      env: SWIFT=3.3
+    - <<: *pod
+      osx_image: xcode10.1
+      env: SWIFT=3.4
+    - <<: *pod
+      osx_image: xcode9.2
+      env: SWIFT=4.0
+    - <<: *pod
+      osx_image: xcode9.4
+      env: SWIFT=4.1
+    - <<: *pod
+      osx_image: xcode10.1
+      env: SWIFT=4.2
+    - <<: *pod
+      osx_image: xcode10.2
+      env: SWIFT=4.3
+    - <<: *pod
+      osx_image: xcode10.2
+      env: SWIFT=5.0
 
-    - {osx_image: xcode9.2,   env: 'PLAT=iOS      SWFT=4.0  DST="OS=11.2,name=iPhone SE"'}
-    - {osx_image: xcode9.2,   env: 'PLAT=watchOS  SWFT=4.0  DST="OS=4.2,name=Apple Watch - 38mm"'}
-
-    - {osx_image: xcode9.3,   env: 'PLAT=iOS      SWFT=4.1  DST="OS=9.3,name=iPhone 5s"'}
-    - {osx_image: xcode9.4,   env: 'PLAT=iOS      SWFT=4.1  DST="OS=10.3.1,name=iPhone 5s"'}
-    - {osx_image: xcode9.4,   env: 'PLAT=iOS      SWFT=4.1  DST="OS=11.4,name=iPhone 5s" TEST=1'}
-    - {osx_image: xcode9.3,   env: 'PLAT=watchOS  SWFT=4.1  DST="OS=2.2,name=Apple Watch - 38mm"'}
-    - {osx_image: xcode9.3,   env: 'PLAT=watchOS  SWFT=4.1  DST="OS=3.2,name=Apple Watch - 38mm"'}
-    - {osx_image: xcode9.4,   env: 'PLAT=watchOS  SWFT=4.1  DST="OS=4.3,name=Apple Watch - 38mm"'}
+    - &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
+    - <<: *carthage
+      osx_image: xcode10.2
 
-    - {osx_image: xcode10,    env: 'PLAT=iOS      SWFT=4.2  DST="OS=12.0,name=iPhone SE"'}
-    - {osx_image: xcode10,    env: 'PLAT=watchOS  SWFT=4.2  DST="OS=5.0,name=Apple Watch Series 3 - 42mm"'}
-cache:
-  directories:
-  - Carthage
-before_install:
-  - carthage bootstrap --cache-builds --no-use-binaries --platform $PLAT --verbose
-install:
-  - xcodebuild -scheme PMKWatchConnectivity -target PMKWatchConnectivity -quiet -destination "$DST" SWIFT_VERSION=$SWFT SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build
-  - if [ "$TEST" == "1" ]; then
-      xcodebuild -scheme PMKWatchConnectivity -target PMKWCTests -quiet -destination "$DST" build;
-    fi
-script:
-  - if [ "$TEST" == "1" ]; then
-      xcodebuild -scheme PMKWatchConnectivity -quiet -destination "$DST" test;
-    fi
+    - stage: test
+      xcode_scheme: PMKWatchConnectivity
+      xcode_project: PMKWatchConnectivity.xcodeproj
+      xcode_destination: 'platform=iOS Simulator,OS=12.2,name=iPhone SE'
+      cache.directories:
+        - Carthage
+      before_script:
+        carthage bootstrap --cache-builds --no-use-binaries

Cartfile

@@ -1 +1 @@
-github "mxcl/PromiseKit" ~> 6.0
+github "mxcl/PromiseKit" ~> 6.8.4

Cartfile.resolved

@@ -1 +1 @@
-github "mxcl/PromiseKit" "6.3.3"
+github "mxcl/PromiseKit" "6.8.4"

PMKWatchConnectivity.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 "PMKWatchConnectivity" */;
 			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;
 		};

PMKWatchConnectivity.xcodeproj/xcshareddata/xcschemes/PMKWatchConnectivity.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"