diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index c7486897383..d992f8d17a1 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -5,23 +5,6 @@ plugins { id("com.diffplug.spotless") version "8.0.0" } -if (!hasLauncherForJavaVersion(17)) { - throw GradleException( - "JDK 17 is required to build and gradle was unable to detect it on the system. " + - "Please install it and see https://docs.gradle.org/current/userguide/toolchains.html#sec:auto_detection " + - "for details on how gradle detects java toolchains." - ) -} - -fun hasLauncherForJavaVersion(version: Int): Boolean { - return try { - javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(version) }.get() - true - } catch (e: Exception) { - false - } -} - spotless { kotlinGradle { ktlint().editorConfigOverride(mapOf( @@ -68,11 +51,3 @@ dependencies { implementation("org.owasp:dependency-check-gradle:12.1.8") implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1") } - -// We can't apply conventions to this build so include important ones such as the Java compilation -// target. -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 95193cc856d..8009ff037f3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,12 +6,13 @@ pluginManagement { id("org.jsonschema2pojo") version "1.2.2" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" id("org.graalvm.buildtools.native") version "0.10.6" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" id("com.gradle.develocity") + id("org.gradle.toolchains.foojay-resolver-convention") } dependencyResolutionManagement {