diff --git a/Package.swift b/Package.swift index ddd6fc4a2f8b..c07f20b5d55d 100644 --- a/Package.swift +++ b/Package.swift @@ -1,5 +1,6 @@ -// swift-tools-version:5.7.1 +// swift-tools-version:5.9 +import CompilerPluginSupport import PackageDescription let package = Package( @@ -19,13 +20,16 @@ let package = Package( dependencies: [ .package(url: "https://github.com/apple/swift-collections", from: "1.1.0"), .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), + .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"601.0.0"), .package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"), .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.0"), .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.3.0"), .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.1.0"), .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.0"), - .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.0.0"), + .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.1.0"), .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"), + .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.2.0"), + .package(url: "https://github.com/pointfreeco/swift-perception", from: "1.1.7"), .package(url: "https://github.com/pointfreeco/swiftui-navigation", from: "1.1.0"), .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.1.0"), ], @@ -33,13 +37,16 @@ let package = Package( .target( name: "ComposableArchitecture", dependencies: [ + "ComposableArchitectureMacros", .product(name: "CasePaths", package: "swift-case-paths"), .product(name: "CombineSchedulers", package: "combine-schedulers"), .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), .product(name: "CustomDump", package: "swift-custom-dump"), .product(name: "Dependencies", package: "swift-dependencies"), + .product(name: "DependenciesMacros", package: "swift-dependencies"), .product(name: "IdentifiedCollections", package: "swift-identified-collections"), .product(name: "OrderedCollections", package: "swift-collections"), + .product(name: "Perception", package: "swift-perception"), .product(name: "SwiftUINavigationCore", package: "swiftui-navigation"), .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"), ], @@ -53,6 +60,20 @@ let package = Package( "ComposableArchitecture" ] ), + .macro( + name: "ComposableArchitectureMacros", + dependencies: [ + .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), + .product(name: "SwiftCompilerPlugin", package: "swift-syntax"), + ] + ), + .testTarget( + name: "ComposableArchitectureMacrosTests", + dependencies: [ + "ComposableArchitectureMacros", + .product(name: "MacroTesting", package: "swift-macro-testing"), + ] + ), .executableTarget( name: "swift-composable-architecture-benchmark", dependencies: [ diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift deleted file mode 100644 index c07f20b5d55d..000000000000 --- a/Package@swift-5.9.swift +++ /dev/null @@ -1,97 +0,0 @@ -// swift-tools-version:5.9 - -import CompilerPluginSupport -import PackageDescription - -let package = Package( - name: "swift-composable-architecture", - platforms: [ - .iOS(.v13), - .macOS(.v10_15), - .tvOS(.v13), - .watchOS(.v6), - ], - products: [ - .library( - name: "ComposableArchitecture", - targets: ["ComposableArchitecture"] - ) - ], - dependencies: [ - .package(url: "https://github.com/apple/swift-collections", from: "1.1.0"), - .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), - .package(url: "https://github.com/apple/swift-syntax", "509.0.0"..<"601.0.0"), - .package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"), - .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.0"), - .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.3.0"), - .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.1.0"), - .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.0"), - .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.1.0"), - .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"), - .package(url: "https://github.com/pointfreeco/swift-macro-testing", from: "0.2.0"), - .package(url: "https://github.com/pointfreeco/swift-perception", from: "1.1.7"), - .package(url: "https://github.com/pointfreeco/swiftui-navigation", from: "1.1.0"), - .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.1.0"), - ], - targets: [ - .target( - name: "ComposableArchitecture", - dependencies: [ - "ComposableArchitectureMacros", - .product(name: "CasePaths", package: "swift-case-paths"), - .product(name: "CombineSchedulers", package: "combine-schedulers"), - .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"), - .product(name: "CustomDump", package: "swift-custom-dump"), - .product(name: "Dependencies", package: "swift-dependencies"), - .product(name: "DependenciesMacros", package: "swift-dependencies"), - .product(name: "IdentifiedCollections", package: "swift-identified-collections"), - .product(name: "OrderedCollections", package: "swift-collections"), - .product(name: "Perception", package: "swift-perception"), - .product(name: "SwiftUINavigationCore", package: "swiftui-navigation"), - .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"), - ], - resources: [ - .process("Resources/PrivacyInfo.xcprivacy") - ] - ), - .testTarget( - name: "ComposableArchitectureTests", - dependencies: [ - "ComposableArchitecture" - ] - ), - .macro( - name: "ComposableArchitectureMacros", - dependencies: [ - .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), - .product(name: "SwiftCompilerPlugin", package: "swift-syntax"), - ] - ), - .testTarget( - name: "ComposableArchitectureMacrosTests", - dependencies: [ - "ComposableArchitectureMacros", - .product(name: "MacroTesting", package: "swift-macro-testing"), - ] - ), - .executableTarget( - name: "swift-composable-architecture-benchmark", - dependencies: [ - "ComposableArchitecture", - .product(name: "Benchmark", package: "swift-benchmark"), - ] - ), - ] -) - -//for target in package.targets where target.type != .system { -// target.swiftSettings = target.swiftSettings ?? [] -// target.swiftSettings?.append( -// .unsafeFlags([ -// "-c", "release", -// "-emit-module-interface", "-enable-library-evolution", -// "-Xfrontend", "-warn-concurrency", -// "-Xfrontend", "-enable-actor-data-race-checks", -// ]) -// ) -//}