Skip to content

Commit 41fc310

Browse files
authored
Lower JDK version for modules not using ffm (#708)
1 parent e0127ae commit 41fc310

28 files changed

Lines changed: 79 additions & 18 deletions

File tree

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ jobs:
221221
'JavaKitSampleApp',
222222
'JavaProbablyPrime',
223223
'JavaSieve',
224-
'SwiftAndJavaJarSampleLib',
224+
'SwiftAndJavaJarFFMSampleLib',
225225
'SwiftJavaExtractFFMSampleApp',
226226
'SwiftJavaExtractJNISampleApp',
227227
]
@@ -249,7 +249,7 @@ jobs:
249249
'JavaKitSampleApp',
250250
'JavaProbablyPrime',
251251
'JavaSieve',
252-
'SwiftAndJavaJarSampleLib',
252+
'SwiftAndJavaJarFFMSampleLib',
253253
'SwiftJavaExtractFFMSampleApp',
254254
'SwiftJavaExtractJNISampleApp',
255255
]

BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins {
2323

2424
java {
2525
toolchain {
26-
languageVersion = JavaLanguageVersion.of(25)
26+
languageVersion = JavaLanguageVersion.of((gradle.extra.properties["swiftJavaJdk"] as? Int) ?: 25)
2727
}
2828
}
2929

File renamed without changes.
File renamed without changes.
File renamed without changes.

Samples/SwiftAndJavaJarSampleLib/Package.swift renamed to Samples/SwiftAndJavaJarFFMSampleLib/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import CompilerPluginSupport
55
import PackageDescription
66

77
let package = Package(
8-
name: "SwiftAndJavaJarSampleLib",
8+
name: "SwiftAndJavaJarFFMSampleLib",
99
platforms: [
1010
.macOS(.v15),
1111
.iOS(.v18),

Samples/SwiftAndJavaJarSampleLib/Sources/MySwiftLibrary/MySwiftClass.swift renamed to Samples/SwiftAndJavaJarFFMSampleLib/Sources/MySwiftLibrary/MySwiftClass.swift

File renamed without changes.

Samples/SwiftAndJavaJarSampleLib/Sources/MySwiftLibrary/MySwiftLibrary.swift renamed to Samples/SwiftAndJavaJarFFMSampleLib/Sources/MySwiftLibrary/MySwiftLibrary.swift

File renamed without changes.

Samples/SwiftAndJavaJarSampleLib/Sources/MySwiftLibrary/swift-java.config renamed to Samples/SwiftAndJavaJarFFMSampleLib/Sources/MySwiftLibrary/swift-java.config

File renamed without changes.

Samples/SwiftAndJavaJarSampleLib/build.gradle.kts renamed to Samples/SwiftAndJavaJarFFMSampleLib/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ repositories {
3232

3333
java {
3434
toolchain {
35-
languageVersion.set(JavaLanguageVersion.of(25))
35+
languageVersion.set(JavaLanguageVersion.of((gradle.extra.properties["swiftJavaJdk"] as? Int) ?: 17))
3636
}
3737
}
3838

@@ -85,13 +85,13 @@ tasks.jar.configure {
8585
}
8686

8787
base {
88-
archivesName = "swift-and-java-jar-sample-lib"
88+
archivesName = "swift-and-java-jar-ffm-sample-lib"
8989
}
9090

9191
publishing {
9292
publications {
9393
create<MavenPublication>("maven") {
94-
artifactId = "swift-and-java-jar-sample-lib"
94+
artifactId = "swift-and-java-jar-ffm-sample-lib"
9595
from(components["java"])
9696
}
9797
}

0 commit comments

Comments
 (0)