Bump travis platform versions & Cartfile.resolved

mxcl · mxcl · commit 41bab77e5668 · 2018-06-20T20:53:02.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,26 +2,29 @@ os: osx
 language: objective-c
 matrix:
   include:
-    - {osx_image: xcode8.3, env: 'PLAT=iOS   SWFT=3.1  DST="OS=8.4,name=iPhone 4S"'}
-    - {osx_image: xcode8.3, env: 'PLAT=iOS   SWFT=3.1  DST="OS=9.3,name=iPhone 6"'}
     - {osx_image: xcode8.3, env: 'PLAT=iOS   SWFT=3.1  DST="OS=10.3.1,name=iPhone SE"'}
-    - {osx_image: xcode8.3, env: 'PLAT=tvOS  SWFT=3.1  DST="OS=9.2,name=Apple TV 1080p"'}
     - {osx_image: xcode8.3, env: 'PLAT=tvOS  SWFT=3.1  DST="OS=10.2,name=Apple TV 1080p"'}
 
     - {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.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.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=iOS   SWFT=4.0  DST="OS=11.2,name=iPhone SE"'}
-    - {osx_image: xcode9.2, env: 'PLAT=tvOS  SWFT=4.0  DST="OS=9.2,name=Apple TV 1080p"'}
-    - {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=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"'}
+    - {osx_image: xcode9.3, env: 'PLAT=tvOS  SWFT=4.1  DST="OS=9.2,name=Apple TV 1080p"'}
+    - {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"'}
 cache:                                                
   directories:
   - Carthage
 install:
   - carthage bootstrap --cache-builds --no-use-binaries --platform $PLAT
 script:
-  - xcodebuild -scheme PMKUIKit -quiet -destination "$DST" build SWIFT_VERSION="$SWFT"
+  - xcodebuild -scheme PMKUIKit -target PMKUIKit -quiet -destination "$DST" build SWIFT_VERSION="$SWFT" SWIFT_TREAT_WARNINGS_AS_ERRORS=YES
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/PMKUIKit.xcodeproj/project.pbxproj b/PMKUIKit.xcodeproj/project.pbxproj
@@ -287,7 +287,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1000;
 				ORGANIZATIONNAME = "Max Howell";
 				TargetAttributes = {
 					630B2DFF1D5D0AF500DC10E9 = {
@@ -455,7 +455,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SUPPRESS_WARNINGS = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_TARGET_NAME = PMKTestsHost;
 			};
 			name = Debug;
@@ -471,7 +471,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.tests.ui.UIKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SUPPRESS_WARNINGS = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_TARGET_NAME = PMKTestsHost;
 			};
 			name = Release;
@@ -491,13 +491,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;
@@ -534,6 +536,7 @@
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos 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.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -555,13 +558,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;
@@ -590,6 +595,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.UIKit;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
@@ -611,7 +617,6 @@
 				PRODUCT_MODULE_NAME = "${TARGET_NAME}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -628,7 +633,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;
 		};
@@ -643,7 +647,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SUPPRESS_WARNINGS = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PMKTestsHost.app/PMKTestsHost";
 			};
 			name = Debug;
@@ -658,7 +662,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.tests.UIKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SUPPRESS_WARNINGS = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PMKTestsHost.app/PMKTestsHost";
 			};
 			name = Release;
@@ -675,7 +679,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.tests.host.UIKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -691,7 +695,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.tests.host.UIKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/PMKUIKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/PMKUIKit.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/PMKUIKit.xcodeproj/xcshareddata/xcschemes/PMKUIKit.xcscheme b/PMKUIKit.xcodeproj/xcshareddata/xcschemes/PMKUIKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -88,7 +87,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 @@`
`1`		`-github "mxcl/PromiseKit" "6.1.0"`
	`1`	`+github "mxcl/PromiseKit" "6.3.3"`