diff --git a/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved index e8da5c1dd9a8..1de3779b1b4c 100644 --- a/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "658be5678358d678b69ea40e4be4814633be8197318d5ac54b97fb40cfb2152b", + "originHash" : "c55ea51a4817791946e7830a957bd243534ea4fed282d6370350fb9dcb3b15c7", "pins" : [ { - "identity" : "combine-schedulers", + "identity" : "opencombine", "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/combine-schedulers", + "location" : "https://github.com/OpenCombine/OpenCombine.git", "state" : { - "revision" : "5928286acce13def418ec36d05a001a9641086f2", - "version" : "1.0.3" + "revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2", + "version" : "0.14.0" } }, { diff --git a/Package.resolved b/Package.resolved index 16f3f5aee6ec..ce22f1b0c09c 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "1313e97b3134138f8ca61f73141726a7e426c0097a38fadeba8e33be243b0d2e", + "originHash" : "4dbe2b8fb0d96366355c9478441b780fc55d98952641571b6dc0611cad660ab7", "pins" : [ { "identity" : "combine-schedulers", "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/combine-schedulers", "state" : { - "revision" : "5928286acce13def418ec36d05a001a9641086f2", - "version" : "1.0.3" + "revision" : "fd16d76fd8b9a976d88bfb6cacc05ca8d19c91b6", + "version" : "1.1.0" } }, { @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections", "state" : { - "revision" : "8c0c0a8b49e080e54e5e328cc552821ff07cd341", - "version" : "1.2.1" + "revision" : "7b847a3b7008b2dc2f47ca3110d8c782fb2e5c7e", + "version" : "1.3.0" } }, { @@ -61,7 +61,7 @@ "location" : "https://github.com/pointfreeco/swift-dependencies", "state" : { "revision" : "a10f9feeb214bc72b5337b6ef6d5a029360db4cc", - "version" : "1.9.5" + "version" : "1.10.0" } }, { @@ -105,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-navigation", "state" : { - "revision" : "6b7f44d218e776bb7a5246efb940440d57c8b2cf", - "version" : "2.4.2" + "revision" : "bf498690e1f6b4af790260f542e8428a4ba10d78", + "version" : "2.6.0" } }, { @@ -114,8 +114,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-perception", "state" : { - "revision" : "30721accd0370d7c9cb5bd0f7cdf5a1a767b383d", - "version" : "2.0.8" + "revision" : "4f47ebafed5f0b0172cf5c661454fa8e28fb2ac4", + "version" : "2.0.9" } }, { @@ -150,8 +150,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "b2ed9eabefe56202ee4939dd9fc46b6241c88317", - "version" : "1.6.1" + "revision" : "4c27acf5394b645b70d8ba19dc249c0472d5f618", + "version" : "1.7.0" } } ], diff --git a/Package.swift b/Package.swift index 9f0d6ee57597..a2557c2e16ae 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.9 +// swift-tools-version:6.0 import CompilerPluginSupport import PackageDescription @@ -77,16 +77,21 @@ let package = Package( .product(name: "MacroTesting", package: "swift-macro-testing"), ] ), - ] + ], + swiftLanguageModes: [.v6] ) -#if compiler(>=6) - for target in package.targets where target.type != .system && target.type != .test { - target.swiftSettings = target.swiftSettings ?? [] - target.swiftSettings?.append(contentsOf: [ - .enableExperimentalFeature("StrictConcurrency"), - .enableUpcomingFeature("ExistentialAny"), - .enableUpcomingFeature("InferSendableFromCaptures"), - ]) - } -#endif +for target in package.targets { + target.swiftSettings = target.swiftSettings ?? [] + target.swiftSettings?.append(contentsOf: [ + .enableUpcomingFeature("ExistentialAny") + ]) +} + +for target in package.targets where target.type == .system || target.type == .test { + target.swiftSettings?.append(contentsOf: [ + .swiftLanguageMode(.v5), + .enableExperimentalFeature("StrictConcurrency"), + .enableUpcomingFeature("InferSendableFromCaptures"), + ]) +} diff --git a/Package@swift-6.0.swift b/Package@swift-5.9.swift similarity index 86% rename from Package@swift-6.0.swift rename to Package@swift-5.9.swift index a2557c2e16ae..9f0d6ee57597 100644 --- a/Package@swift-6.0.swift +++ b/Package@swift-5.9.swift @@ -1,4 +1,4 @@ -// swift-tools-version:6.0 +// swift-tools-version:5.9 import CompilerPluginSupport import PackageDescription @@ -77,21 +77,16 @@ let package = Package( .product(name: "MacroTesting", package: "swift-macro-testing"), ] ), - ], - swiftLanguageModes: [.v6] + ] ) -for target in package.targets { - target.swiftSettings = target.swiftSettings ?? [] - target.swiftSettings?.append(contentsOf: [ - .enableUpcomingFeature("ExistentialAny") - ]) -} - -for target in package.targets where target.type == .system || target.type == .test { - target.swiftSettings?.append(contentsOf: [ - .swiftLanguageMode(.v5), - .enableExperimentalFeature("StrictConcurrency"), - .enableUpcomingFeature("InferSendableFromCaptures"), - ]) -} +#if compiler(>=6) + for target in package.targets where target.type != .system && target.type != .test { + target.swiftSettings = target.swiftSettings ?? [] + target.swiftSettings?.append(contentsOf: [ + .enableExperimentalFeature("StrictConcurrency"), + .enableUpcomingFeature("ExistentialAny"), + .enableUpcomingFeature("InferSendableFromCaptures"), + ]) + } +#endif