File tree Expand file tree Collapse file tree 3 files changed +24
-1
lines changed Expand file tree Collapse file tree 3 files changed +24
-1
lines changed Original file line number Diff line number Diff line change 4
4
import PackageDescription
5
5
import Foundation
6
6
7
+ let swiftPMBranch : String
8
+ #if compiler(>=6.1)
9
+ swiftPMBranch = " release/6.1 "
10
+ #else
11
+ swiftPMBranch = " release/6.0 "
12
+ #endif
13
+
7
14
let swiftSettings : [ SwiftSetting ] = [
8
15
. enableExperimentalFeature( " StrictConcurrency " ) ,
9
16
. unsafeFlags( [ " -strict-concurrency=complete " ] ) ,
@@ -23,7 +30,7 @@ let package = Package(
23
30
] ,
24
31
dependencies: [
25
32
. package ( url: " https://github.com/swiftlang/swift-package-manager.git " ,
26
- branch: " release/6.1 " ) ,
33
+ branch: swiftPMBranch ) ,
27
34
. package ( url: " https://github.com/apple/swift-log.git " ,
28
35
from: " 1.5.2 " ) ,
29
36
. package ( url: " https://github.com/apple/swift-collections " ,
Original file line number Diff line number Diff line change @@ -86,13 +86,23 @@ struct DescriptionPackage: PackageLocator {
86
86
87
87
let workspace = try Self . makeWorkspace ( toolchain: toolchain, packagePath: packageDirectory)
88
88
let scope = makeObservabilitySystem ( ) . topScope
89
+ #if compiler(>=6.1)
89
90
self . graph = try await workspace. loadPackageGraph (
90
91
rootInput: PackageGraphRootInput ( packages: [ packageDirectory. spmAbsolutePath] ) ,
91
92
// This option is same with resolver option `--disable-automatic-resolution`
92
93
// Never update Package.resolved of the package
93
94
forceResolvedVersions: onlyUseVersionsFromResolvedFile,
94
95
observabilityScope: scope
95
96
)
97
+ #else
98
+ self . graph = try workspace. loadPackageGraph (
99
+ rootInput: PackageGraphRootInput ( packages: [ packageDirectory. spmAbsolutePath] ) ,
100
+ // This option is same with resolver option `--disable-automatic-resolution`
101
+ // Never update Package.resolved of the package
102
+ forceResolvedVersions: onlyUseVersionsFromResolvedFile,
103
+ observabilityScope: scope
104
+ )
105
+ #endif
96
106
self . manifest = try await workspace. loadRootManifest (
97
107
at: packageDirectory. spmAbsolutePath,
98
108
observabilityScope: scope
Original file line number Diff line number Diff line change @@ -207,8 +207,14 @@ private struct PIFLibraryTargetModifier {
207
207
208
208
let toolchainLibDir = ( try ? buildParameters. toolchain. toolchainLibDir) ?? . root
209
209
210
+ #if compiler(>=6.1)
210
211
settings [ . PRODUCT_NAME] = c99Name
211
212
settings [ . PRODUCT_MODULE_NAME] = c99Name
213
+ #else
214
+ settings [ . PRODUCT_NAME] = " $(EXECUTABLE_NAME:c99extidentifier) "
215
+ settings [ . PRODUCT_MODULE_NAME] = " $(EXECUTABLE_NAME:c99extidentifier) "
216
+ settings [ . EXECUTABLE_NAME] = c99Name
217
+ #endif
212
218
settings [ . TARGET_NAME] = name
213
219
settings [ . PRODUCT_BUNDLE_IDENTIFIER] = name. spm_mangledToBundleIdentifier ( )
214
220
settings [ . CLANG_ENABLE_MODULES] = " YES "
You can’t perform that action at this time.
0 commit comments