Merge pull request #307 from mattrubin/xcode-10.2

mattrubin · web-flow · commit d130ae204028 · 2019-04-12T02:05:42.000-04:00
Update dependencies and project configuration for Xcode 10.2.
diff --git a/Authenticator.xcodeproj/project.pbxproj b/Authenticator.xcodeproj/project.pbxproj
@@ -132,10 +132,6 @@
 		C944A5731A7F772600E08B1E /* iOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Application.xcconfig"; sourceTree = "<group>"; };
 		C944A5751A7F772600E08B1E /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Framework.xcconfig"; sourceTree = "<group>"; };
 		C944A5761A7F772600E08B1E /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
-		C944A5781A7F772600E08B1E /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = "<group>"; };
-		C944A57A1A7F772600E08B1E /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
-		C944A57B1A7F772600E08B1E /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
-		C944A57C1A7F772600E08B1E /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
 		C94765081C646E5E00C7527E /* Cartfile.private */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile.private; sourceTree = "<group>"; };
 		C959A63C190A69120042DEC0 /* Icon.svg */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Icon.svg; sourceTree = "<group>"; };
 		C959A63E190A69E60042DEC0 /* GenerateIcons.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = GenerateIcons.sh; sourceTree = "<group>"; };
@@ -312,7 +308,6 @@
 			children = (
 				C944A5671A7F772500E08B1E /* Base */,
 				C944A5721A7F772600E08B1E /* iOS */,
-				C944A5771A7F772600E08B1E /* Mac OS X */,
 			);
 			name = Configuration;
 			path = Carthage/Checkouts/xcconfigs;
@@ -339,17 +334,6 @@
 			path = iOS;
 			sourceTree = "<group>";
 		};
-		C944A5771A7F772600E08B1E /* Mac OS X */ = {
-			isa = PBXGroup;
-			children = (
-				C944A5781A7F772600E08B1E /* Mac-Application.xcconfig */,
-				C944A57A1A7F772600E08B1E /* Mac-DynamicLibrary.xcconfig */,
-				C944A57B1A7F772600E08B1E /* Mac-Framework.xcconfig */,
-				C944A57C1A7F772600E08B1E /* Mac-StaticLibrary.xcconfig */,
-			);
-			path = "Mac OS X";
-			sourceTree = "<group>";
-		};
 		C9776E32185187E8003D53CB /* Docs */ = {
 			isa = PBXGroup;
 			children = (
@@ -592,26 +576,27 @@
 				TargetAttributes = {
 					1D6058900D05DD3D006BFB54 = {
 						DevelopmentTeam = WD7ETSN9J9;
-						LastSwiftMigration = 0910;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					C9906A2D1812522100BAEF53 = {
-						LastSwiftMigration = 0910;
+						LastSwiftMigration = 1020;
 						TestTargetID = 1D6058900D05DD3D006BFB54;
 					};
 					C9A262CC1E170BD4004E6CEB = {
 						CreatedOnToolsVersion = 8.2.1;
-						LastSwiftMigration = 0910;
+						LastSwiftMigration = 1020;
 						TestTargetID = 1D6058900D05DD3D006BFB54;
 					};
 				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Authenticator" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			projectDirPath = "";
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,4 +1,4 @@
 # Configuration for Carthage (https://github.com/Carthage/Carthage)
 
-github "jspahrsummers/xcconfigs"
+github "jspahrsummers/xcconfigs" ~> 1.0
 github "shinydevelopment/SimulatorStatusMagic"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
 github "SVProgressHUD/SVProgressHUD" "2.2.5"
-github "jspahrsummers/xcconfigs" "0.12"
-github "mattrubin/Base32" "xcode9"
-github "mattrubin/OneTimePassword" "3.1.4"
-github "shinydevelopment/SimulatorStatusMagic" "2.3.2"
+github "jspahrsummers/xcconfigs" "1.0"
+github "mattrubin/Base32" "1.1.2+xcode10.2"
+github "mattrubin/OneTimePassword" "3.1.5"
+github "shinydevelopment/SimulatorStatusMagic" "2.4.1"
diff --git a/Carthage/Checkouts/Base32 b/Carthage/Checkouts/Base32
@@ -1 +1 @@
-Subproject commit 24f64bf81b15c815019f37cf64cfbb3a253e2bea
+Subproject commit d3265800b6c0ac9c0927f7989d0750017dd10ffc
diff --git a/Carthage/Checkouts/OneTimePassword b/Carthage/Checkouts/OneTimePassword
@@ -1 +1 @@
-Subproject commit 09b940e9eae27a1f9a6001ceb4bca0540d65e888
+Subproject commit 8e32517705c140360b2b09e655ccd70f63e15fdc
diff --git a/Carthage/Checkouts/SimulatorStatusMagic b/Carthage/Checkouts/SimulatorStatusMagic
@@ -1 +1 @@
-Subproject commit cfdcf4897953ae70fbe44c35950f72dc9243fa1e
+Subproject commit c96f49c3d1fc037e5d7fed3b58b9399488e6a571
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
@@ -1 +1 @@
-Subproject commit bb795558a76e5daf3688500055bbcfe243bffa8d
+Subproject commit d0f8992afad45262cfe3a3cf512e7127fdcf296c
