Bump travis platform versions & Cartfile.resolved

PromiseKit · Jun 20, 2018 · 1716ee6 · 1716ee6
1 parent 1a276e4
commit 1716ee6
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,19 +10,32 @@ matrix:
     - {osx_image: xcode9.2,   env: 'PLAT=iOS     SWFT=3.2 DST="OS=11.2,name=iPhone SE"'}
     - {osx_image: xcode9.2,   env: 'PLAT=tvOS    SWFT=3.2 DST="OS=11.2,name=Apple TV"'}
 
+    - {osx_image: xcode9.4,   env: 'PLAT=macOS   SWFT=3.3 DST="arch=x86_64"'}
+    - {osx_image: xcode9.4,   env: 'PLAT=iOS     SWFT=3.3 DST="OS=11.4,name=iPhone 5s"'}
+    - {osx_image: xcode9.4,   env: 'PLAT=tvOS    SWFT=3.3 DST="OS=11.4,name=Apple TV"'}
+
     - {osx_image: xcode9.2,   env: 'PLAT=macOS   SWFT=4.0 DST="arch=x86_64"'}
-    - {osx_image: xcode9.2,   env: 'PLAT=iOS     SWFT=4.0 DST="OS=8.4,name=iPhone 4s"'}
-    - {osx_image: xcode9.2,   env: 'PLAT=iOS     SWFT=4.0 DST="OS=9.3,name=iPhone SE"'}
-    - {osx_image: xcode9.2,   env: 'PLAT=iOS     SWFT=4.0 DST="OS=10.3.1,name=iPhone SE"'}
     - {osx_image: xcode9.2,   env: 'PLAT=iOS     SWFT=4.0 DST="OS=11.2,name=iPhone SE"'}
-    - {osx_image: xcode9.2,   env: 'PLAT=tvOS    SWFT=4.0 DST="OS=10.2,name=Apple TV 1080p"'}
     - {osx_image: xcode9.2,   env: 'PLAT=tvOS    SWFT=4.0 DST="OS=11.2,name=Apple TV"'}
+
+    - {osx_image: xcode9.4,   env: 'PLAT=macOS   SWFT=4.1 DST="arch=x86_64" TEST=1'}
+    - {osx_image: xcode9.4,   env: 'PLAT=iOS     SWFT=4.1 DST="OS=8.4,name=iPhone 4s"'}
+    - {osx_image: xcode9.4,   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 SE"'}
+    - {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=tvOS    SWFT=4.1 DST="OS=10.2,name=Apple TV 1080p"'}
+    - {osx_image: xcode9.4,   env: 'PLAT=tvOS    SWFT=4.1 DST="OS=11.4,name=Apple TV" TEST=1'}
 cache:
   directories:
   - Carthage
 before_install:
   - carthage bootstrap --cache-builds --no-use-binaries --platform $PLAT --verbose
 install:
-  - xcodebuild -scheme PMKMapKit -quiet -destination "$DST" SWIFT_VERSION=$SWFT build-for-testing
+  - xcodebuild -scheme PMKMapKit -target PMKMapKit -quiet -destination "$DST" SWIFT_VERSION=$SWFT SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build
+  - if [[ $TEST == "1" ]]; then
+      xcodebuild -scheme PMKMapKit -target PMKMKTests -quiet -destination "$DST" build;
+    fi
 script:
-  - xcodebuild -scheme PMKMapKit -quiet -destination "$DST" SWIFT_VERSION=$SWFT test
+  - if [[ $TEST == "1" ]]; then
+      xcodebuild -scheme PMKMapKit -quiet -destination "$DST" SWIFT_VERSION=$SWFT test;
+    fi
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "mxcl/PromiseKit" "6.1.0"
+github "mxcl/PromiseKit" "6.3.3"
diff --git a/PMKMapKit.xcodeproj/project.pbxproj b/PMKMapKit.xcodeproj/project.pbxproj
@@ -164,7 +164,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "Max Howell";
 				TargetAttributes = {
 					63C7FFA61D5BEE09003BAE60 = {
@@ -260,13 +260,15 @@
 				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;
 				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;
@@ -303,6 +305,7 @@
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -325,13 +328,15 @@
 				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;
 				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;
@@ -360,6 +365,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.MapKit;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 9.2;
 				VALIDATE_PRODUCT = YES;
@@ -383,7 +389,6 @@
 				PRODUCT_MODULE_NAME = "${TARGET_NAME}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -400,7 +405,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;
 		};
@@ -414,7 +418,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SUPPRESS_WARNINGS = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -427,7 +431,7 @@
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SUPPRESS_WARNINGS = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/PMKMapKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/PMKMapKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/PMKMapKit.xcodeproj/xcshareddata/xcschemes/PMKMapKit.xcscheme b/PMKMapKit.xcodeproj/xcshareddata/xcschemes/PMKMapKit.xcscheme
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "NO">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting = "YES"
+            buildForTesting = "NO"
             buildForRunning = "YES"
             buildForProfiling = "YES"
             buildForArchiving = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -70,7 +69,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "mxcl/PromiseKit" "6.1.0"
		github "mxcl/PromiseKit" "6.3.3"