Skip to content

Commit a488fef

Browse files
mbrandonwstephencelis
mbrandonw
and
stephencelis
authored
Turn on Swift 6 mode in examples project. (#247)
* Turn of Swift 6 mode in examples project. * fix * Use xcode 16. * wip * wip --------- Co-authored-by: Stephen Celis <[email protected]>
1 parent 57ab05c commit a488fef

File tree

9 files changed

+25
-26
lines changed

9 files changed

+25
-26
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ jobs:
8181
run: |
8282
PREFIX=/opt/swift
8383
set -ex
84-
curl -f -o /tmp/swift.tar.gz "https://download.swift.org/swift-6.0.2-release/ubuntu2204/swift-6.0.2-RELEASE/swift-6.0.2-RELEASE-ubuntu22.04.tar.gz"
84+
curl -f -o /tmp/swift.tar.gz "https://download.swift.org/swift-6.0.3-release/ubuntu2204/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-ubuntu22.04.tar.gz"
8585
sudo mkdir -p $PREFIX; sudo tar -xzf /tmp/swift.tar.gz -C $PREFIX --strip-component 1
86-
$PREFIX/usr/bin/swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.0.2-RELEASE/swift-wasm-6.0.2-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 6ffedb055cb9956395d9f435d03d53ebe9f6a8d45106b979d1b7f53358e1dcb4
86+
$PREFIX/usr/bin/swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.0.3-RELEASE/swift-wasm-6.0.3-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 31d3585b06dd92de390bacc18527801480163188cd7473f492956b5e213a8618
8787
echo "$PREFIX/usr/bin" >> $GITHUB_PATH
8888
8989
- name: Build tests

‎Examples/CaseStudies/Internal/CaseStudy.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import SwiftUI
22
import UIKitNavigation
33

4+
@MainActor
45
protocol CaseStudy {
56
var readMe: String { get }
67
var caseStudyTitle: String { get }

‎Examples/CaseStudiesTests/Internal/AssertEventually.swift‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import XCTest
33

44
@MainActor
55
func assertEventuallyEqual<T: Equatable>(
6-
_ expression1: @autoclosure @escaping @MainActor () -> T,
7-
_ expression2: @autoclosure @escaping @MainActor () -> T,
6+
_ expression1: @autoclosure () -> T,
7+
_ expression2: @autoclosure () -> T,
88
timeout: TimeInterval = 1,
99
file: StaticString = #file,
1010
line: UInt = #line
@@ -22,8 +22,8 @@ func assertEventuallyEqual<T: Equatable>(
2222

2323
@MainActor
2424
func assertEventuallyNoDifference<T: Equatable>(
25-
_ expression1: @autoclosure @escaping @MainActor () -> T,
26-
_ expression2: @autoclosure @escaping @MainActor () -> T,
25+
_ expression1: @autoclosure () -> T,
26+
_ expression2: @autoclosure () -> T,
2727
timeout: TimeInterval = 1,
2828
file: StaticString = #file,
2929
line: UInt = #line
@@ -51,8 +51,8 @@ func assertEventuallyNoDifference<T: Equatable>(
5151

5252
@MainActor
5353
func assertEventuallyNotEqual<T: Equatable>(
54-
_ expression1: @autoclosure @escaping @MainActor () -> T,
55-
_ expression2: @autoclosure @escaping @MainActor () -> T,
54+
_ expression1: @autoclosure () -> T,
55+
_ expression2: @autoclosure () -> T,
5656
timeout: TimeInterval = 1,
5757
file: StaticString = #file,
5858
line: UInt = #line
@@ -70,7 +70,7 @@ func assertEventuallyNotEqual<T: Equatable>(
7070

7171
@MainActor
7272
func assertEventuallyNil<T>(
73-
_ expression: @autoclosure @escaping @MainActor () -> T?,
73+
_ expression: @autoclosure () -> T?,
7474
timeout: TimeInterval = 1,
7575
file: StaticString = #file,
7676
line: UInt = #line
@@ -87,7 +87,7 @@ func assertEventuallyNil<T>(
8787

8888
@MainActor
8989
func assertEventuallyNotNil<T>(
90-
_ expression: @autoclosure @escaping @MainActor () -> T?,
90+
_ expression: @autoclosure () -> T?,
9191
timeout: TimeInterval = 1,
9292
file: StaticString = #file,
9393
line: UInt = #line
@@ -104,8 +104,8 @@ func assertEventuallyNotNil<T>(
104104

105105
@MainActor
106106
private func _assertEventually<T>(
107-
_ expression1: @autoclosure @escaping @MainActor () -> T,
108-
_ expression2: @autoclosure @escaping @MainActor () -> T,
107+
_ expression1: @autoclosure () -> T,
108+
_ expression2: @autoclosure () -> T,
109109
condition: (T, T) -> Bool,
110110
assert: (
111111
@autoclosure () -> T,
@@ -137,7 +137,7 @@ private func _assertEventually<T>(
137137

138138
@MainActor
139139
private func _assertEventually<T>(
140-
_ expression: @autoclosure @escaping @MainActor () -> T,
140+
_ expression: @autoclosure () -> T,
141141
condition: (T) -> Bool,
142142
assert: (@autoclosure () -> T, @autoclosure () -> String, StaticString, UInt) -> Void,
143143
timeout: TimeInterval,
@@ -155,6 +155,6 @@ private func _assertEventually<T>(
155155
assert(value, "", file, line)
156156
return
157157
}
158-
await Task.yield()
158+
await Task { try? await Task.sleep(nanoseconds: 1000) }.value
159159
}
160160
}

‎Examples/Examples.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@
414414
attributes = {
415415
BuildIndependentTargetsInParallel = 1;
416416
LastSwiftUpdateCheck = 1540;
417-
LastUpgradeCheck = 1510;
417+
LastUpgradeCheck = 1610;
418418
TargetAttributes = {
419419
CA4737C7272F095F0012CAC3 = {
420420
CreatedOnToolsVersion = 13.1;
@@ -631,6 +631,7 @@
631631
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
632632
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
633633
SWIFT_STRICT_CONCURRENCY = complete;
634+
SWIFT_VERSION = 6.0;
634635
};
635636
name = Debug;
636637
};
@@ -686,6 +687,7 @@
686687
SWIFT_COMPILATION_MODE = wholemodule;
687688
SWIFT_OPTIMIZATION_LEVEL = "-O";
688689
SWIFT_STRICT_CONCURRENCY = complete;
690+
SWIFT_VERSION = 6.0;
689691
VALIDATE_PRODUCT = YES;
690692
};
691693
name = Release;
@@ -714,7 +716,6 @@
714716
PRODUCT_NAME = "$(TARGET_NAME)";
715717
SWIFT_EMIT_LOC_STRINGS = YES;
716718
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
717-
SWIFT_VERSION = 5.0;
718719
TARGETED_DEVICE_FAMILY = "1,2";
719720
};
720721
name = Debug;
@@ -742,7 +743,6 @@
742743
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.Inventory;
743744
PRODUCT_NAME = "$(TARGET_NAME)";
744745
SWIFT_EMIT_LOC_STRINGS = YES;
745-
SWIFT_VERSION = 5.0;
746746
TARGETED_DEVICE_FAMILY = "1,2";
747747
};
748748
name = Release;
@@ -772,7 +772,6 @@
772772
PRODUCT_NAME = "$(TARGET_NAME)";
773773
SWIFT_EMIT_LOC_STRINGS = YES;
774774
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
775-
SWIFT_VERSION = 5.0;
776775
TARGETED_DEVICE_FAMILY = "1,2";
777776
};
778777
name = Debug;
@@ -801,7 +800,6 @@
801800
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.CaseStudies;
802801
PRODUCT_NAME = "$(TARGET_NAME)";
803802
SWIFT_EMIT_LOC_STRINGS = YES;
804-
SWIFT_VERSION = 5.0;
805803
TARGETED_DEVICE_FAMILY = "1,2";
806804
};
807805
name = Release;
@@ -823,7 +821,6 @@
823821
PRODUCT_NAME = "$(TARGET_NAME)";
824822
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
825823
SWIFT_EMIT_LOC_STRINGS = NO;
826-
SWIFT_VERSION = 5.0;
827824
TARGETED_DEVICE_FAMILY = "1,2";
828825
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CaseStudies.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/CaseStudies";
829826
};
@@ -845,7 +842,6 @@
845842
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.CaseStudiesTests;
846843
PRODUCT_NAME = "$(TARGET_NAME)";
847844
SWIFT_EMIT_LOC_STRINGS = NO;
848-
SWIFT_VERSION = 5.0;
849845
TARGETED_DEVICE_FAMILY = "1,2";
850846
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CaseStudies.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/CaseStudies";
851847
};
@@ -858,6 +854,7 @@
858854
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
859855
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
860856
CLANG_ENABLE_MODULES = YES;
857+
CODE_SIGN_IDENTITY = "";
861858
CODE_SIGN_STYLE = Manual;
862859
CURRENT_PROJECT_VERSION = 1;
863860
DEFINES_MODULE = YES;
@@ -904,6 +901,7 @@
904901
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
905902
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
906903
CLANG_ENABLE_MODULES = YES;
904+
CODE_SIGN_IDENTITY = "";
907905
CODE_SIGN_STYLE = Manual;
908906
CURRENT_PROJECT_VERSION = 1;
909907
DEFINES_MODULE = YES;

‎Examples/Examples.xcodeproj/xcshareddata/xcschemes/CaseStudies.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1540"
3+
LastUpgradeVersion = "1610"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Examples/Examples.xcodeproj/xcshareddata/xcschemes/Inventory.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1510"
3+
LastUpgradeVersion = "1610"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SwiftNavigation.xcworkspace/xcshareddata/xcschemes/SwiftNavigation.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1600"
3+
LastUpgradeVersion = "1610"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SwiftNavigation.xcworkspace/xcshareddata/xcschemes/SwiftUINavigation.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1600"
3+
LastUpgradeVersion = "1610"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SwiftNavigation.xcworkspace/xcshareddata/xcschemes/UIKitNavigation.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1600"
3+
LastUpgradeVersion = "1610"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)