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 <stephen@stephencelis.com>
pointfreeco · Feb 25, 2025 · a488fef · a488fef
1 parent 57ab05c
commit a488fef
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -81,9 +81,9 @@ jobs:
         run: |
           PREFIX=/opt/swift
           set -ex
-          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"
+          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"
           sudo mkdir -p $PREFIX; sudo tar -xzf /tmp/swift.tar.gz -C $PREFIX --strip-component 1
-          $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
+          $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
           echo "$PREFIX/usr/bin" >> $GITHUB_PATH
 
       - name: Build tests

diff --git a/Examples/CaseStudies/Internal/CaseStudy.swift b/Examples/CaseStudies/Internal/CaseStudy.swift
@@ -1,6 +1,7 @@
 import SwiftUI
 import UIKitNavigation
 
+@MainActor
 protocol CaseStudy {
   var readMe: String { get }
   var caseStudyTitle: String { get }

diff --git a/Examples/CaseStudiesTests/Internal/AssertEventually.swift b/Examples/CaseStudiesTests/Internal/AssertEventually.swift
@@ -3,8 +3,8 @@ import XCTest
 
 @MainActor
 func assertEventuallyEqual<T: Equatable>(
-  _ expression1: @autoclosure @escaping @MainActor () -> T,
-  _ expression2: @autoclosure @escaping @MainActor () -> T,
+  _ expression1: @autoclosure () -> T,
+  _ expression2: @autoclosure () -> T,
   timeout: TimeInterval = 1,
   file: StaticString = #file,
   line: UInt = #line
@@ -22,8 +22,8 @@ func assertEventuallyEqual<T: Equatable>(
 
 @MainActor
 func assertEventuallyNoDifference<T: Equatable>(
-  _ expression1: @autoclosure @escaping @MainActor () -> T,
-  _ expression2: @autoclosure @escaping @MainActor () -> T,
+  _ expression1: @autoclosure () -> T,
+  _ expression2: @autoclosure () -> T,
   timeout: TimeInterval = 1,
   file: StaticString = #file,
   line: UInt = #line
@@ -51,8 +51,8 @@ func assertEventuallyNoDifference<T: Equatable>(
 
 @MainActor
 func assertEventuallyNotEqual<T: Equatable>(
-  _ expression1: @autoclosure @escaping @MainActor () -> T,
-  _ expression2: @autoclosure @escaping @MainActor () -> T,
+  _ expression1: @autoclosure () -> T,
+  _ expression2: @autoclosure () -> T,
   timeout: TimeInterval = 1,
   file: StaticString = #file,
   line: UInt = #line
@@ -70,7 +70,7 @@ func assertEventuallyNotEqual<T: Equatable>(
 
 @MainActor
 func assertEventuallyNil<T>(
-  _ expression: @autoclosure @escaping @MainActor () -> T?,
+  _ expression: @autoclosure () -> T?,
   timeout: TimeInterval = 1,
   file: StaticString = #file,
   line: UInt = #line
@@ -87,7 +87,7 @@ func assertEventuallyNil<T>(
 
 @MainActor
 func assertEventuallyNotNil<T>(
-  _ expression: @autoclosure @escaping @MainActor () -> T?,
+  _ expression: @autoclosure () -> T?,
   timeout: TimeInterval = 1,
   file: StaticString = #file,
   line: UInt = #line
@@ -104,8 +104,8 @@ func assertEventuallyNotNil<T>(
 
 @MainActor
 private func _assertEventually<T>(
-  _ expression1: @autoclosure @escaping @MainActor () -> T,
-  _ expression2: @autoclosure @escaping @MainActor () -> T,
+  _ expression1: @autoclosure () -> T,
+  _ expression2: @autoclosure () -> T,
   condition: (T, T) -> Bool,
   assert: (
     @autoclosure () -> T,
@@ -137,7 +137,7 @@ private func _assertEventually<T>(
 
 @MainActor
 private func _assertEventually<T>(
-  _ expression: @autoclosure @escaping @MainActor () -> T,
+  _ expression: @autoclosure () -> T,
   condition: (T) -> Bool,
   assert: (@autoclosure () -> T, @autoclosure () -> String, StaticString, UInt) -> Void,
   timeout: TimeInterval,
@@ -155,6 +155,6 @@ private func _assertEventually<T>(
       assert(value, "", file, line)
       return
     }
-    await Task.yield()
+    await Task { try? await Task.sleep(nanoseconds: 1000) }.value
   }
 }
diff --git a/Examples/Examples.xcodeproj/project.pbxproj b/Examples/Examples.xcodeproj/project.pbxproj
@@ -414,7 +414,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1540;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1610;
 				TargetAttributes = {
 					CA4737C7272F095F0012CAC3 = {
 						CreatedOnToolsVersion = 13.1;
@@ -631,6 +631,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -686,6 +687,7 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_STRICT_CONCURRENCY = complete;
+				SWIFT_VERSION = 6.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -714,7 +716,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -742,7 +743,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.Inventory;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -772,7 +772,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -801,7 +800,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.CaseStudies;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -823,7 +821,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CaseStudies.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/CaseStudies";
 			};
@@ -845,7 +842,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.CaseStudiesTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CaseStudies.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/CaseStudies";
 			};
@@ -858,6 +854,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;
@@ -904,6 +901,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEFINES_MODULE = YES;

diff --git a/Examples/Examples.xcodeproj/xcshareddata/xcschemes/CaseStudies.xcscheme b/Examples/Examples.xcodeproj/xcshareddata/xcschemes/CaseStudies.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Examples/Examples.xcodeproj/xcshareddata/xcschemes/Inventory.xcscheme b/Examples/Examples.xcodeproj/xcshareddata/xcschemes/Inventory.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/SwiftNavigation.xcworkspace/xcshareddata/xcschemes/SwiftNavigation.xcscheme b/SwiftNavigation.xcworkspace/xcshareddata/xcschemes/SwiftNavigation.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1600"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/SwiftNavigation.xcworkspace/xcshareddata/xcschemes/SwiftUINavigation.xcscheme b/SwiftNavigation.xcworkspace/xcshareddata/xcschemes/SwiftUINavigation.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1600"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/SwiftNavigation.xcworkspace/xcshareddata/xcschemes/UIKitNavigation.xcscheme b/SwiftNavigation.xcworkspace/xcshareddata/xcschemes/UIKitNavigation.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1600"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"