Skip to content

Commit 2be9610

Browse files
committed
Restore back SwiftPM release/6.0 branch support
1 parent 68085df commit 2be9610

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

Package.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
import PackageDescription
55
import Foundation
66

7+
let swiftPMBranch: String
8+
#if compiler(>=6.1)
9+
swiftPMBranch = "release/6.1"
10+
#else
11+
swiftPMBranch = "release/6.0"
12+
#endif
13+
714
let swiftSettings: [SwiftSetting] = [
815
.enableExperimentalFeature("StrictConcurrency"),
916
.unsafeFlags(["-strict-concurrency=complete"]),
@@ -23,7 +30,7 @@ let package = Package(
2330
],
2431
dependencies: [
2532
.package(url: "https://github.com/swiftlang/swift-package-manager.git",
26-
branch: "release/6.1"),
33+
branch: swiftPMBranch),
2734
.package(url: "https://github.com/apple/swift-log.git",
2835
from: "1.5.2"),
2936
.package(url: "https://github.com/apple/swift-collections",

Sources/ScipioKit/DescriptionPackage.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,23 @@ struct DescriptionPackage: PackageLocator {
8686

8787
let workspace = try Self.makeWorkspace(toolchain: toolchain, packagePath: packageDirectory)
8888
let scope = makeObservabilitySystem().topScope
89+
#if compiler(>=6.1)
8990
self.graph = try await workspace.loadPackageGraph(
9091
rootInput: PackageGraphRootInput(packages: [packageDirectory.spmAbsolutePath]),
9192
// This option is same with resolver option `--disable-automatic-resolution`
9293
// Never update Package.resolved of the package
9394
forceResolvedVersions: onlyUseVersionsFromResolvedFile,
9495
observabilityScope: scope
9596
)
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
96106
self.manifest = try await workspace.loadRootManifest(
97107
at: packageDirectory.spmAbsolutePath,
98108
observabilityScope: scope

Sources/ScipioKit/Producer/PIF/PIFGenerator.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,14 @@ private struct PIFLibraryTargetModifier {
207207

208208
let toolchainLibDir = (try? buildParameters.toolchain.toolchainLibDir) ?? .root
209209

210+
#if compiler(>=6.1)
210211
settings[.PRODUCT_NAME] = c99Name
211212
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
212218
settings[.TARGET_NAME] = name
213219
settings[.PRODUCT_BUNDLE_IDENTIFIER] = name.spm_mangledToBundleIdentifier()
214220
settings[.CLANG_ENABLE_MODULES] = "YES"

0 commit comments

Comments
 (0)