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

Carthage Xcode 10.2 support

Author: mxcl

.travis.yml

@@ -1,8 +1,13 @@
+os: osx
+language: swift
+osx_image: xcode10.2
+
 branches:
   only: 
     - master
 stages:
   - lint
+  - carthage
   - swiftPM
   - test
 jobs:
@@ -11,11 +16,8 @@ jobs:
       stage: lint
       osx_image: xcode8.3
       env: SWIFT=3.1
-      name: pod lib lint --swift-version=3.1
-      os: osx
-      language: objective-c
       before_install:
-        gem install cocoapods --prerelease --version 1.6.0.beta.1
+        gem install cocoapods --prerelease --version 1.7.0.beta.3
       install:
         carthage bootstrap --no-build PromiseKit
       script: |
@@ -27,54 +29,63 @@ 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=5.0
 
-    - stage: swiftPM
-      os: osx
-      language: objective-c
+    - &carthage
+      stage: carthage
+      osx_image: xcode9.2
+      script: |
+        carthage bootstrap --cache-builds
+        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: SwiftPM
-      script: swift build
+    - <<: *carthage
+      osx_image: xcode10.2
+    
+    - &swiftpm
+      stage: swiftpm
+      osx_image: xcode9.2
+      script: swift build -Xswiftc -target -Xswiftc x86_64-apple-macosx10.12
+    - <<: *swiftpm
+      osx_image: xcode9.4
+    - <<: *swiftpm
+      osx_image: xcode10.1
+    - <<: *swiftpm
+      osx_image: xcode10.2
 
     - &test
       stage: test
-      osx_image: xcode10.1
-      name: macOS Tests
-      env: DST='arch=x86_64' PLAT=macOS
-      os: osx
-      language: objective-c
-      cache:
-        directories:
+      xcode_scheme: PMKStoreKit
+      xcode_project: PMKStoreKit.xcodeproj
+      xcode_destination: 'platform=macOS'
+      cache.directories:
         - Carthage
       before_install:
-        carthage bootstrap --cache-builds --no-use-binaries --platform $PLAT
-      install:
-        xcodebuild -scheme PMKStoreKit -target PMKStoreKit -quiet -destination "$DST" SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build
-      script:
-        xcodebuild -scheme PMKStoreKit -quiet -destination "$DST" test
+        carthage bootstrap --cache-builds --no-use-binaries
     - <<: *test
-      env: DST='OS=12.0,name=iPhone SE' PLAT=iOS
-      name: iOS Tests
+      xcode_destination: 'OS=12.2,name=iPhone SE'
     - <<: *test
-      env: DST='OS=12.0,name=Apple TV' PLAT=tvOS
-      name: tvOS Tests
+      xcode_destination: 'OS=12.2,name=Apple TV'

Cartfile

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

Cartfile.resolved

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

PMKStoreKit.xcodeproj/project.pbxproj

@@ -166,27 +166,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 "PMKStoreKit" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 63C7FF9D1D5BEE09003BAE60;
 			productRefGroup = 63C7FFA81D5BEE09003BAE60 /* Products */;
@@ -255,6 +256,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++";
@@ -323,6 +325,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++";
@@ -393,6 +396,7 @@
 				PRODUCT_MODULE_NAME = "${TARGET_NAME}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 			};
 			name = Debug;
 		};
@@ -409,6 +413,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;
 		};

PMKStoreKit.xcodeproj/xcshareddata/xcschemes/PMKStoreKit.xcscheme

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

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:4.0
 import PackageDescription
 
 let name = "PMKStoreKit"
@@ -7,7 +7,7 @@ let pkg = Package(name: name)
 pkg.products = [
     .library(name: name, targets: [name]),
 ]
-pkg.swiftLanguageVersions = [.v3, .v4, .v4_2]
+pkg.swiftLanguageVersions = [3, 4]
 pkg.dependencies = [
 	.package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.0.0")
 ]

[email protected]

@@ -0,0 +1,24 @@
+// swift-tools-version:4.2
+import PackageDescription
+
+let name = "PMKStoreKit"
+
+let pkg = Package(name: name)
+pkg.products = [
+    .library(name: name, targets: [name]),
+]
+pkg.swiftLanguageVersions = [.v3, .v4, .v4_2, .version("5")]
+pkg.dependencies = [
+	.package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.0.0")
+]
+
+let target: Target = .target(name: name)
+target.path = "Sources"
+target.exclude = [
+  "SKRequest+AnyPromise.h",
+	"SKRequest+AnyPromise.m",
+	"\(name).h",
+]
+target.dependencies = ["PromiseKit"]
+
+pkg.targets = [target]