Skip to content

Commit 7fe14e9

Browse files
committed
Fix gradle deprecation warning
1 parent d98302b commit 7fe14e9

File tree

2 files changed

+2
-26
lines changed

2 files changed

+2
-26
lines changed

buildSrc/build.gradle.kts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,6 @@ plugins {
55
id("com.diffplug.spotless") version "8.0.0"
66
}
77

8-
if (!hasLauncherForJavaVersion(17)) {
9-
throw GradleException(
10-
"JDK 17 is required to build and gradle was unable to detect it on the system. " +
11-
"Please install it and see https://docs.gradle.org/current/userguide/toolchains.html#sec:auto_detection " +
12-
"for details on how gradle detects java toolchains."
13-
)
14-
}
15-
16-
fun hasLauncherForJavaVersion(version: Int): Boolean {
17-
return try {
18-
javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(version) }.get()
19-
true
20-
} catch (e: Exception) {
21-
false
22-
}
23-
}
24-
258
spotless {
269
kotlinGradle {
2710
ktlint().editorConfigOverride(mapOf(
@@ -68,11 +51,3 @@ dependencies {
6851
implementation("org.owasp:dependency-check-gradle:12.1.8")
6952
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
7053
}
71-
72-
// We can't apply conventions to this build so include important ones such as the Java compilation
73-
// target.
74-
java {
75-
toolchain {
76-
languageVersion.set(JavaLanguageVersion.of(17))
77-
}
78-
}

settings.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ pluginManagement {
66
id("org.jsonschema2pojo") version "1.2.2"
77
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
88
id("org.graalvm.buildtools.native") version "0.10.6"
9+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
910
}
1011
}
1112

1213
plugins {
13-
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
1414
id("com.gradle.develocity")
15+
id("org.gradle.toolchains.foojay-resolver-convention")
1516
}
1617

1718
dependencyResolutionManagement {

0 commit comments

Comments
 (0)