Skip to content

Commit

Permalink
Fix Swift Language mode for UITest targets (#20)
Browse files Browse the repository at this point in the history
# Fix Swift Language mode for UITest targets

## ♻️ Current situation & Problem
Even though #19 enabled Swift 6 Language Mode on the project wide build
settings for the UITest project, all the individual targets had a manual
override specifying Swift 5. This was fixed by this PR making sure Swift
6 is enabled by default for all targets.

## ⚙️ Release Notes 
* Fixed Swift 6 Language Mode for UITest targets.

### Code of Conduct & Contributing Guidelines 

By submitting creating this pull request, you agree to follow our [Code
of
Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md):
- [x] I agree to follow the [Code of
Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md).
  • Loading branch information
Supereg authored Nov 20, 2024
1 parent d9fedae commit 117e8d5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
with:
scheme: TemplatePackage
destination: 'platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)'
destination: 'platform=watchOS Simulator,name=Apple Watch Series 10 (46mm)'
resultBundle: TemplatePackage-watchOS.xcresult
artifactname: TemplatePackage-watchOS.xcresult
packagevisionos:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
runsonlabels: '["macOS", "self-hosted"]'
path: 'Tests/UITests'
scheme: TestAppWatchApp
destination: 'platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)'
destination: 'platform=watchOS Simulator,name=Apple Watch Series 10 (46mm)'
resultBundle: TestApp-watchOS.xcresult
artifactname: TestApp-watchOS.xcresult
visionos:
Expand Down
3 changes: 2 additions & 1 deletion Tests/UITests/TestAppUITests/TestAppUITests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ class TestAppUITests: XCTestCase {
continueAfterFailure = false
}



@MainActor
func testTemplatePackage() throws {
let app = XCUIApplication()
app.launch()
Expand Down
12 changes: 0 additions & 12 deletions Tests/UITests/UITests.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,6 @@
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_STRICT_CONCURRENCY = complete;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,7";
};
name = Debug;
Expand Down Expand Up @@ -581,7 +580,6 @@
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_STRICT_CONCURRENCY = complete;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,7";
};
name = Release;
Expand All @@ -602,7 +600,6 @@
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,7";
TEST_TARGET_NAME = TestApp;
};
Expand All @@ -624,7 +621,6 @@
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,7";
TEST_TARGET_NAME = TestApp;
};
Expand Down Expand Up @@ -658,7 +654,6 @@
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
};
name = Debug;
Expand Down Expand Up @@ -690,7 +685,6 @@
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
};
name = Test;
Expand Down Expand Up @@ -722,7 +716,6 @@
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
};
name = Release;
Expand All @@ -744,7 +737,6 @@
SDKROOT = watchos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
TEST_TARGET_NAME = TestAppWatchApp;
};
Expand All @@ -766,7 +758,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
TEST_TARGET_NAME = TestAppWatchApp;
};
Expand All @@ -788,7 +779,6 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
TEST_TARGET_NAME = TestAppWatchApp;
};
Expand Down Expand Up @@ -890,7 +880,6 @@
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_STRICT_CONCURRENCY = complete;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,7";
};
name = Test;
Expand All @@ -911,7 +900,6 @@
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,7";
TEST_TARGET_NAME = TestApp;
};
Expand Down

0 comments on commit 117e8d5

Please sign in to comment.