RUM-4829 Set SWIFT_VERSION through Base.xcconfig for `Integration…

…Tests`
DataDog · Jun 12, 2024 · e1bc9b0 · e1bc9b0
1 parent 4ab86be
commit e1bc9b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/IntegrationTests/IntegrationTests.xcodeproj/project.pbxproj b/IntegrationTests/IntegrationTests.xcodeproj/project.pbxproj
@@ -1314,7 +1314,6 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
-				SWIFT_VERSION = 5.0;
 				VALIDATE_WORKSPACE = YES;
 			};
 			name = Debug;
@@ -1336,7 +1335,6 @@
 				PRODUCT_NAME = "Integration Tests Runner";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
-				SWIFT_VERSION = 5.0;
 				VALIDATE_WORKSPACE = YES;
 			};
 			name = Release;
@@ -1358,7 +1356,6 @@
 				PRODUCT_NAME = "Integration Tests Runner";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
-				SWIFT_VERSION = 5.0;
 				VALIDATE_WORKSPACE = YES;
 			};
 			name = Integration;
@@ -1378,7 +1375,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG DD_COMPILED_FOR_INTEGRATION_TESTS";
-				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = "Runner iOS";
 				VALIDATE_WORKSPACE = YES;
 			};
@@ -1399,7 +1395,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DD_COMPILED_FOR_INTEGRATION_TESTS;
-				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = "Runner iOS";
 				VALIDATE_WORKSPACE = YES;
 			};
@@ -1420,7 +1415,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DD_COMPILED_FOR_INTEGRATION_TESTS;
-				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = "Runner iOS";
 				VALIDATE_WORKSPACE = YES;
 			};

diff --git a/IntegrationTests/xcconfigs/Base.xcconfig b/IntegrationTests/xcconfigs/Base.xcconfig
@@ -2,6 +2,9 @@
 IPHONEOS_DEPLOYMENT_TARGET=12.0
 TVOS_DEPLOYMENT_TARGET=12.0
 
+// Minimum supported Swift version
+SWIFT_VERSION=5.9
+
 // Add common settings from Datadog.xcconfig
 #include "../xcconfigs/Datadog.xcconfig"