Skip to content

Commit 117e8d5

Browse files
Fix Swift Language mode for UITest targets (#20)
# 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).
1 parent d9fedae commit 117e8d5

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
3131
with:
3232
scheme: TemplatePackage
33-
destination: 'platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)'
33+
destination: 'platform=watchOS Simulator,name=Apple Watch Series 10 (46mm)'
3434
resultBundle: TemplatePackage-watchOS.xcresult
3535
artifactname: TemplatePackage-watchOS.xcresult
3636
packagevisionos:
@@ -82,7 +82,7 @@ jobs:
8282
runsonlabels: '["macOS", "self-hosted"]'
8383
path: 'Tests/UITests'
8484
scheme: TestAppWatchApp
85-
destination: 'platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)'
85+
destination: 'platform=watchOS Simulator,name=Apple Watch Series 10 (46mm)'
8686
resultBundle: TestApp-watchOS.xcresult
8787
artifactname: TestApp-watchOS.xcresult
8888
visionos:

Tests/UITests/TestAppUITests/TestAppUITests.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ class TestAppUITests: XCTestCase {
1717
continueAfterFailure = false
1818
}
1919

20-
20+
21+
@MainActor
2122
func testTemplatePackage() throws {
2223
let app = XCUIApplication()
2324
app.launch()

Tests/UITests/UITests.xcodeproj/project.pbxproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,6 @@
546546
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
547547
SWIFT_EMIT_LOC_STRINGS = YES;
548548
SWIFT_STRICT_CONCURRENCY = complete;
549-
SWIFT_VERSION = 5.0;
550549
TARGETED_DEVICE_FAMILY = "1,2,3,7";
551550
};
552551
name = Debug;
@@ -581,7 +580,6 @@
581580
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
582581
SWIFT_EMIT_LOC_STRINGS = YES;
583582
SWIFT_STRICT_CONCURRENCY = complete;
584-
SWIFT_VERSION = 5.0;
585583
TARGETED_DEVICE_FAMILY = "1,2,3,7";
586584
};
587585
name = Release;
@@ -602,7 +600,6 @@
602600
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
603601
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
604602
SWIFT_EMIT_LOC_STRINGS = NO;
605-
SWIFT_VERSION = 5.0;
606603
TARGETED_DEVICE_FAMILY = "1,2,3,7";
607604
TEST_TARGET_NAME = TestApp;
608605
};
@@ -624,7 +621,6 @@
624621
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
625622
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
626623
SWIFT_EMIT_LOC_STRINGS = NO;
627-
SWIFT_VERSION = 5.0;
628624
TARGETED_DEVICE_FAMILY = "1,2,3,7";
629625
TEST_TARGET_NAME = TestApp;
630626
};
@@ -658,7 +654,6 @@
658654
SKIP_INSTALL = YES;
659655
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
660656
SWIFT_EMIT_LOC_STRINGS = YES;
661-
SWIFT_VERSION = 5.0;
662657
TARGETED_DEVICE_FAMILY = 4;
663658
};
664659
name = Debug;
@@ -690,7 +685,6 @@
690685
SDKROOT = watchos;
691686
SKIP_INSTALL = YES;
692687
SWIFT_EMIT_LOC_STRINGS = YES;
693-
SWIFT_VERSION = 5.0;
694688
TARGETED_DEVICE_FAMILY = 4;
695689
};
696690
name = Test;
@@ -722,7 +716,6 @@
722716
SDKROOT = watchos;
723717
SKIP_INSTALL = YES;
724718
SWIFT_EMIT_LOC_STRINGS = YES;
725-
SWIFT_VERSION = 5.0;
726719
TARGETED_DEVICE_FAMILY = 4;
727720
};
728721
name = Release;
@@ -744,7 +737,6 @@
744737
SDKROOT = watchos;
745738
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
746739
SWIFT_EMIT_LOC_STRINGS = NO;
747-
SWIFT_VERSION = 5.0;
748740
TARGETED_DEVICE_FAMILY = 4;
749741
TEST_TARGET_NAME = TestAppWatchApp;
750742
};
@@ -766,7 +758,6 @@
766758
PRODUCT_NAME = "$(TARGET_NAME)";
767759
SDKROOT = watchos;
768760
SWIFT_EMIT_LOC_STRINGS = NO;
769-
SWIFT_VERSION = 5.0;
770761
TARGETED_DEVICE_FAMILY = 4;
771762
TEST_TARGET_NAME = TestAppWatchApp;
772763
};
@@ -788,7 +779,6 @@
788779
PRODUCT_NAME = "$(TARGET_NAME)";
789780
SDKROOT = watchos;
790781
SWIFT_EMIT_LOC_STRINGS = NO;
791-
SWIFT_VERSION = 5.0;
792782
TARGETED_DEVICE_FAMILY = 4;
793783
TEST_TARGET_NAME = TestAppWatchApp;
794784
};
@@ -890,7 +880,6 @@
890880
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
891881
SWIFT_EMIT_LOC_STRINGS = YES;
892882
SWIFT_STRICT_CONCURRENCY = complete;
893-
SWIFT_VERSION = 5.0;
894883
TARGETED_DEVICE_FAMILY = "1,2,3,7";
895884
};
896885
name = Test;
@@ -911,7 +900,6 @@
911900
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
912901
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
913902
SWIFT_EMIT_LOC_STRINGS = NO;
914-
SWIFT_VERSION = 5.0;
915903
TARGETED_DEVICE_FAMILY = "1,2,3,7";
916904
TEST_TARGET_NAME = TestApp;
917905
};

0 commit comments

Comments
 (0)