Support both Swift 5.8 and Swift 5.9 #105
+128
−247
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,3 +13,5 @@ DerivedData/ | |
| Tests/**/XCFrameworks/* | ||
|
|
||
| **/docs | ||
|
|
||
| Package.resolved | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| // swift-tools-version: 5.6 | ||
| // The swift-tools-version declares the minimum version of Swift required to build this package. | ||
|
|
||
| import PackageDescription | ||
| import Foundation | ||
|
|
||
| let package = Package( | ||
| name: "Scipio", | ||
| platforms: [ | ||
| .macOS(.v12), | ||
|
There was a problem hiding this comment. How about change it to v13 in both Package.swift side? Many engineer may use new macOS There was a problem hiding this comment. I'll upgrade the development environment later because I want to remove NSRegularExpression. But I'll do this next time. |
||
| ], | ||
| products: [ | ||
| .executable(name: "scipio", | ||
| targets: ["scipio"]), | ||
| .library( | ||
| name: "ScipioKit", | ||
| targets: ["ScipioKit"]), | ||
| .library( | ||
| name: "ScipioS3Storage", | ||
| targets: ["ScipioS3Storage"]), | ||
| ], | ||
| dependencies: [ | ||
| .package(url: "https://github.com/giginet/swift-package-manager.git", | ||
| revision: "99575e7a3eb8e66112ec45e2f11ef23a1828b110"), | ||
|
There was a problem hiding this comment. I upgrade the fork to the commit giginet/swift-package-manager@99575e7 SwiftPM refers HEAD of swift-driver and swift-support-tools-core. This fork should be used for legacy Xcode users (14.3). So it will be removed after dropping 14 support. |
||
| .package(url: "https://github.com/apple/swift-log.git", | ||
| .upToNextMinor(from: "1.4.2")), | ||
| .package(url: "https://github.com/apple/swift-collections", | ||
| from: "1.0.4"), | ||
| .package(url: "https://github.com/apple/swift-argument-parser.git", | ||
| from: "1.1.0"), | ||
| .package(url: "https://github.com/apple/swift-algorithms.git", | ||
| from: "1.0.0"), | ||
| .package(url: "https://github.com/onevcat/Rainbow", | ||
| .upToNextMinor(from: "4.0.1")), | ||
| .package(url: "https://github.com/soto-project/soto-codegenerator", | ||
| from: "0.6.0"), | ||
| .package(url: "https://github.com/soto-project/soto-core.git", | ||
| from: "6.4.0"), | ||
| ], | ||
| targets: [ | ||
| .executableTarget(name: "scipio", | ||
| dependencies: [ | ||
| .target(name: "ScipioKit"), | ||
| .product(name: "ArgumentParser", package: "swift-argument-parser"), | ||
| ]), | ||
| .target( | ||
| name: "ScipioKit", | ||
| dependencies: [ | ||
| .product(name: "SwiftPMDataModel-auto", package: "swift-package-manager"), | ||
| .product(name: "XCBuildSupport", package: "swift-package-manager"), | ||
| .product(name: "Logging", package: "swift-log"), | ||
| .product(name: "Collections", package: "swift-collections"), | ||
| .product(name: "Algorithms", package: "swift-algorithms"), | ||
| .product(name: "Rainbow", package: "Rainbow"), | ||
| ], | ||
| plugins: [ | ||
| .plugin(name: "GenerateScipioVersion") | ||
| ] | ||
| ), | ||
| .plugin( | ||
| name: "GenerateScipioVersion", | ||
| capability: .buildTool() | ||
| ), | ||
| .target( | ||
| name: "ScipioS3Storage", | ||
| dependencies: [ | ||
| .target(name: "ScipioKit"), | ||
| .product(name: "SotoCore", package: "soto-core"), | ||
| ], | ||
| plugins: [ | ||
| .plugin(name: "SotoCodeGeneratorPlugin", package: "soto-codegenerator"), | ||
| ] | ||
| ), | ||
| .testTarget( | ||
| name: "ScipioKitTests", | ||
| dependencies: [ | ||
| .target(name: "ScipioKit"), | ||
| ], | ||
| exclude: ["Resources/Fixtures/"], | ||
| resources: [.copy("Resources/Fixtures")]), | ||
| .testTarget( | ||
| name: "ScipioS3StorageTests", | ||
| dependencies: ["ScipioS3Storage"]), | ||
| ] | ||
| ) | ||
|
|
||
| let isDevelopment = ProcessInfo.processInfo.environment["SCIPIO_DEVELOPMENT"] == "1" | ||
|
|
||
| // swift-docs is not needed for package users | ||
| if isDevelopment { | ||
| package.dependencies += [ | ||
| .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"), | ||
| ] | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎉 your changes released, right?