Skip to content

Commit afa95be

Browse files
committed
Revert "wip"
This reverts commit c5d0a06.
1 parent 3e85c7e commit afa95be

File tree

2 files changed

+109
-17
lines changed

2 files changed

+109
-17
lines changed

Package.swift

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:6.0
1+
// swift-tools-version:5.9
22

33
import CompilerPluginSupport
44
import PackageDescription
@@ -77,21 +77,16 @@ let package = Package(
7777
.product(name: "MacroTesting", package: "swift-macro-testing"),
7878
]
7979
),
80-
],
81-
swiftLanguageModes: [.v6]
80+
]
8281
)
8382

84-
for target in package.targets {
85-
target.swiftSettings = target.swiftSettings ?? []
86-
target.swiftSettings?.append(contentsOf: [
87-
.enableUpcomingFeature("ExistentialAny")
88-
])
89-
}
90-
91-
for target in package.targets where target.type == .system || target.type == .test {
92-
target.swiftSettings?.append(contentsOf: [
93-
.swiftLanguageMode(.v5),
94-
.enableExperimentalFeature("StrictConcurrency"),
95-
.enableUpcomingFeature("InferSendableFromCaptures"),
96-
])
97-
}
83+
#if compiler(>=6)
84+
for target in package.targets where target.type != .system && target.type != .test {
85+
target.swiftSettings = target.swiftSettings ?? []
86+
target.swiftSettings?.append(contentsOf: [
87+
.enableExperimentalFeature("StrictConcurrency"),
88+
.enableUpcomingFeature("ExistentialAny"),
89+
.enableUpcomingFeature("InferSendableFromCaptures"),
90+
])
91+
}
92+
#endif

[email protected]

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
// swift-tools-version:6.0
2+
3+
import CompilerPluginSupport
4+
import PackageDescription
5+
6+
let package = Package(
7+
name: "swift-composable-architecture",
8+
platforms: [
9+
.iOS(.v13),
10+
.macOS(.v10_15),
11+
.tvOS(.v13),
12+
.watchOS(.v6),
13+
],
14+
products: [
15+
.library(
16+
name: "ComposableArchitecture",
17+
targets: ["ComposableArchitecture"]
18+
)
19+
],
20+
dependencies: [
21+
.package(url: "https://github.com/apple/swift-collections", from: "1.1.0"),
22+
.package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.2"),
23+
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.4"),
24+
.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.2.0"),
25+
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
26+
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
27+
.package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),
28+
.package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.2.0"),
29+
.package(url: "https://github.com/pointfreeco/swift-navigation", branch: "swift-6-2"),
30+
.package(url: "https://github.com/pointfreeco/swift-perception", branch: "swift-6-2"),
31+
.package(url: "https://github.com/pointfreeco/swift-sharing", branch: "swift-6-2"),
32+
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.3.0"),
33+
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0"),
34+
.package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"602.0.0"),
35+
],
36+
targets: [
37+
.target(
38+
name: "ComposableArchitecture",
39+
dependencies: [
40+
"ComposableArchitectureMacros",
41+
.product(name: "CasePaths", package: "swift-case-paths"),
42+
.product(name: "CombineSchedulers", package: "combine-schedulers"),
43+
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
44+
.product(name: "CustomDump", package: "swift-custom-dump"),
45+
.product(name: "Dependencies", package: "swift-dependencies"),
46+
.product(name: "DependenciesMacros", package: "swift-dependencies"),
47+
.product(name: "IdentifiedCollections", package: "swift-identified-collections"),
48+
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
49+
.product(name: "OrderedCollections", package: "swift-collections"),
50+
.product(name: "Perception", package: "swift-perception"),
51+
.product(name: "Sharing", package: "swift-sharing"),
52+
.product(name: "SwiftUINavigation", package: "swift-navigation"),
53+
.product(name: "UIKitNavigation", package: "swift-navigation"),
54+
],
55+
resources: [
56+
.process("Resources/PrivacyInfo.xcprivacy")
57+
]
58+
),
59+
.testTarget(
60+
name: "ComposableArchitectureTests",
61+
dependencies: [
62+
"ComposableArchitecture",
63+
.product(name: "IssueReportingTestSupport", package: "xctest-dynamic-overlay"),
64+
]
65+
),
66+
.macro(
67+
name: "ComposableArchitectureMacros",
68+
dependencies: [
69+
.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
70+
.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
71+
]
72+
),
73+
.testTarget(
74+
name: "ComposableArchitectureMacrosTests",
75+
dependencies: [
76+
"ComposableArchitectureMacros",
77+
.product(name: "MacroTesting", package: "swift-macro-testing"),
78+
]
79+
),
80+
],
81+
swiftLanguageModes: [.v6]
82+
)
83+
84+
for target in package.targets {
85+
target.swiftSettings = target.swiftSettings ?? []
86+
target.swiftSettings?.append(contentsOf: [
87+
.enableUpcomingFeature("ExistentialAny")
88+
])
89+
}
90+
91+
for target in package.targets where target.type == .system || target.type == .test {
92+
target.swiftSettings?.append(contentsOf: [
93+
.swiftLanguageMode(.v5),
94+
.enableExperimentalFeature("StrictConcurrency"),
95+
.enableUpcomingFeature("InferSendableFromCaptures"),
96+
])
97+
}

0 commit comments

Comments
 (0)