Skip to content

Commit 2d69d25

Browse files
authored
Merge pull request #218 from giginet/0.29.1-swift-6.2-to-merge
Support Swift 6.2 for 0.29.1
2 parents 3a84943 + 2f77b42 commit 2d69d25

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

Package.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ import PackageDescription
55
import Foundation
66

77
let swiftPMBranch: String
8-
#if compiler(>=6.1)
8+
#if compiler(>=6.2) // Xcode 26
9+
swiftPMBranch = "release/6.2"
10+
#elseif compiler(>=6.1) // Xcode 16.3, 16.4
911
swiftPMBranch = "release/6.1"
10-
#else
12+
#else // Xcode 16.2 or earlier
1113
swiftPMBranch = "release/6.0"
1214
#endif
1315

Sources/ScipioKit/Producer/PIF/PIFCompiler.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,16 @@ struct PIFCompiler: Compiler {
125125
}
126126

127127
private func makeBuildParameters(toolchain: UserToolchain) throws -> BuildParameters {
128+
#if compiler(>=6.2)
129+
try .init(
130+
destination: .target,
131+
dataPath: descriptionPackage.buildDirectory.spmAbsolutePath,
132+
configuration: buildOptions.buildConfiguration.spmConfiguration,
133+
toolchain: toolchain,
134+
flags: .init(),
135+
driverParameters: BuildParameters.Driver(enableParseableModuleInterfaces: buildOptions.enableLibraryEvolution)
136+
)
137+
#else
128138
try .init(
129139
destination: .target,
130140
dataPath: descriptionPackage.buildDirectory.spmAbsolutePath,
@@ -134,6 +144,7 @@ struct PIFCompiler: Compiler {
134144
isXcodeBuildSystemEnabled: true,
135145
driverParameters: BuildParameters.Driver(enableParseableModuleInterfaces: buildOptions.enableLibraryEvolution)
136146
)
147+
#endif
137148
}
138149
}
139150

0 commit comments

Comments
 (0)