Skip to content

Commit 4ed5f1f

Browse files
Convert to gradle toolchain for managing java/jdk versions
Toolchain auto-provisioning enabled via foojay resolver
1 parent e058227 commit 4ed5f1f

3 files changed

Lines changed: 21 additions & 3 deletions

File tree

JShellAPI/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.gradle.jvm.toolchain.JavaLanguageVersion
2+
13
plugins {
24
id 'java'
35
id 'org.springframework.boot' version '3.0.1'
@@ -8,7 +10,12 @@ plugins {
810

911
group 'org.togetherjava'
1012
version '1.0-SNAPSHOT'
11-
sourceCompatibility = '19'
13+
14+
java {
15+
toolchain {
16+
languageVersion = JavaLanguageVersion.of(19)
17+
}
18+
}
1219

1320
repositories {
1421
mavenCentral()

JShellWrapper/build.gradle

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1+
import org.gradle.jvm.toolchain.JavaLanguageVersion
2+
13
plugins {
24
id 'java'
35
id 'com.google.cloud.tools.jib' version '3.3.0'
46
}
57

68
group 'org.togetherjava'
79
version '1.0-SNAPSHOT'
8-
sourceCompatibility = '19'
10+
11+
java {
12+
toolchain {
13+
languageVersion = JavaLanguageVersion.of(19)
14+
}
15+
}
916

1017
repositories {
1118
mavenCentral()
@@ -23,4 +30,4 @@ dependencies {
2330

2431
tasks.named('test') {
2532
useJUnitPlatform()
26-
}
33+
}

settings.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
plugins {
2+
id "org.gradle.toolchains.foojay-resolver" version "0.7.0"
3+
}
4+
15
rootProject.name = "JShellPlaygroundBackend"
26
include "JShellWrapper"
37
include "JShellAPI"

0 commit comments

Comments
 (0)