Merge remote-tracking branch 'origin/master' into scheme-fixes

Weebly · Apr 30, 2019 · 531c367 · 531c367
2 parents 4178fa8 + 4a7bc58
commit 531c367
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: objective-c
-osx_image: xcode8
-xcode_projec: Try.xcodeproj
+osx_image: xcode10.2
+xcode_project: Try.xcodeproj
 xcode_scheme: Try
-xcode_sdk: iphonesimulator10.0
-
+script: xcodebuild -project Try.xcodeproj -target Try -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty
diff --git a/Try.podspec b/Try.podspec
@@ -13,8 +13,8 @@ handling system.
   s.osx.deployment_target = "10.9"
   s.watchos.deployment_target = "2.0"
   s.tvos.deployment_target = "9.0"
-  s.source       = { :git => "https://github.com/Weebly/Try.git", :tag => "v2.1.0" }
+  s.source       = { :git => "https://github.com/Weebly/Try.git", :tag => "v2.1.1" }
   s.source_files  = "Try/trap.swift", "Try/WBTry.h", "Try/WBTry.m"
   s.requires_arc = true
-  s.swift_version = "4.0"
+  s.swift_version = "5.0"
 end
diff --git a/Try.xcodeproj/project.pbxproj b/Try.xcodeproj/project.pbxproj
@@ -150,17 +150,18 @@
 					};
 					1AAD317D1C651C6500825D28 = {
 						CreatedOnToolsVersion = 7.2.1;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
 			buildConfigurationList = 1AAD31781C651C6500825D28 /* Build configuration list for PBXProject "Try" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				English,
 				en,
+				Base,
 			);
 			mainGroup = 1AAD31741C651C6500825D28;
 			productRefGroup = 1AAD317F1C651C6500825D28 /* Products */;
@@ -403,8 +404,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -423,8 +423,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.Weebly.Try;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Try.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Try.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>