Update macOS project

surpher · Aug 5, 2023 · c8cf870 · c8cf870
1 parent 58a711b
commit c8cf870
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 15 deletions.
diff --git a/Pact-macOS-SPM-Example/Pact-macOS-SPM-Example.xcodeproj/project.pbxproj b/Pact-macOS-SPM-Example/Pact-macOS-SPM-Example.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -208,8 +208,9 @@
 		ADA11F3C2544D84E00AFEB95 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1200;
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					ADA11F432544D84E00AFEB95 = {
 						CreatedOnToolsVersion = 12.0;
@@ -363,6 +364,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -380,7 +382,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -424,6 +426,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -435,7 +438,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 11.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
@@ -453,6 +456,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Pact-macOS-SPM-Example/Preview Content\"";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = "Pact-macOS-SPM-Example/Info.plist";
@@ -476,6 +480,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Pact-macOS-SPM-Example/Preview Content\"";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = "Pact-macOS-SPM-Example/Info.plist";
@@ -497,6 +502,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "Pact-macOS-SPM-ExampleTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -505,7 +511,7 @@
 					"@loader_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pact-foundation.PactSwift.Pact-macOS-SPM-ExampleTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -520,6 +526,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				INFOPLIST_FILE = "Pact-macOS-SPM-ExampleTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -528,7 +535,7 @@
 					"@loader_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pact-foundation.PactSwift.Pact-macOS-SPM-ExampleTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -542,12 +549,14 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				INFOPLIST_FILE = "Pact-macOS-SPM-ExampleUITests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pact-foundation.PactSwift.Pact-macOS-SPM-ExampleUITests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -561,12 +570,14 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				INFOPLIST_FILE = "Pact-macOS-SPM-ExampleUITests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.pact-foundation.PactSwift.Pact-macOS-SPM-ExampleUITests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -620,8 +631,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/surpher/PactSwift";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.0;
+				branch = main;
+				kind = branch;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/...e/Pact-macOS-SPM-Example.xcodeproj/xcshareddata/xcschemes/Pact-macOS-SPM-Example.xcscheme b/...e/Pact-macOS-SPM-Example.xcodeproj/xcshareddata/xcschemes/Pact-macOS-SPM-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Pact-macOS-SPM-Example/Pact-macOS-SPM-ExampleTests/Pact_macOS_SPM_ExampleTests.swift b/Pact-macOS-SPM-Example/Pact-macOS-SPM-ExampleTests/Pact_macOS_SPM_ExampleTests.swift
@@ -237,7 +237,7 @@ class Pact_macOS_SPM_ExampleTests: XCTestCase {
 				body: [
 					"name": Matcher.SomethingLike("foo"),
 					"age": ExampleGenerator.RandomInt(min: 18, max: 64)
-				]
+				] as [String : Any]
 			)
 
 		let apiClient = RestManager()
@@ -286,9 +286,9 @@ class Pact_macOS_SPM_ExampleTests: XCTestCase {
 							"last_name": Matcher.SomethingLike("Tester"),
 							"joined": ExampleGenerator.RandomDate(format: "dd.MM.yyyy"),
 							// and we don't care about the avatar 🤷‍♂️
-						]
+						] as [String : Any]
 					]
-				]
+				] as [String : Any]
 			)
 
 		let apiClient = RestManager()

diff --git a/Pact-macOS-SPM-Example/Pact-macOS-SPM-ExampleTests/TestData.swift b/Pact-macOS-SPM-Example/Pact-macOS-SPM-ExampleTests/TestData.swift
@@ -21,9 +21,9 @@ var userDataResponse: Any {
 				"first_name": Matcher.SomethingLike("John"),
 				"last_name": Matcher.SomethingLike("Tester")
 				// and we don't care about the avatar 🤷‍♂️
-			]
+			] as [String : Any]
 		]
-	]
+	] as [String : Any]
 }
 
 var singleUserResponse: Any {
@@ -33,7 +33,7 @@ var singleUserResponse: Any {
 			"first_name": Matcher.SomethingLike("John"),
 			"last_name": Matcher.SomethingLike("Tester")
 			// and we don't care about the avatar 🤷‍♂️
-		]
+		] as [String : Any]
 	]
 }