File 0001-drop-setVendor-for-Java.patch of Package gradle7
From e76f8c5bad2a5c8273de8b1fe63e33157c58d4ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Wed, 21 Sep 2022 16:09:49 +0200
Subject: [PATCH 1/2] drop setVendor for Java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Klaus Kämpf <kkaempf@suse.de>
---
build-logic-commons/gradle-plugin/src/main/kotlin/common.kt | 1 -
.../src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts | 1 -
.../docs/src/snippets/java/toolchain-filters/groovy/build.gradle | 1 -
.../src/snippets/java/toolchain-filters/kotlin/build.gradle.kts | 1 -
4 files changed, 4 deletions(-)
diff --git a/build-logic-commons/gradle-plugin/src/main/kotlin/common.kt b/build-logic-commons/gradle-plugin/src/main/kotlin/common.kt
index e02e6f21092..c1f4c5b55ab 100644
--- a/build-logic-commons/gradle-plugin/src/main/kotlin/common.kt
+++ b/build-logic-commons/gradle-plugin/src/main/kotlin/common.kt
@@ -20,6 +20,5 @@ import org.gradle.jvm.toolchain.JvmVendorSpec
fun JavaPluginExtension.configureJavaToolChain() {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
- vendor.set(JvmVendorSpec.ADOPTIUM)
}
}
diff --git a/build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts b/build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts
index 4cc84ab1e4a..fdc91a8ad16 100644
--- a/build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts
@@ -59,7 +59,6 @@ tasks.registerCITestDistributionLifecycleTasks()
fun configureCompile() {
java.toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
- vendor.set(JvmVendorSpec.ADOPTIUM)
}
tasks.withType<JavaCompile>().configureEach {
diff --git a/subprojects/docs/src/snippets/java/toolchain-filters/groovy/build.gradle b/subprojects/docs/src/snippets/java/toolchain-filters/groovy/build.gradle
index 39a69909f09..ee6284c215f 100644
--- a/subprojects/docs/src/snippets/java/toolchain-filters/groovy/build.gradle
+++ b/subprojects/docs/src/snippets/java/toolchain-filters/groovy/build.gradle
@@ -6,7 +6,6 @@ plugins {
java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
- vendor = JvmVendorSpec.ADOPTIUM
}
}
// end::toolchain-known-vendor[]
diff --git a/subprojects/docs/src/snippets/java/toolchain-filters/kotlin/build.gradle.kts b/subprojects/docs/src/snippets/java/toolchain-filters/kotlin/build.gradle.kts
index a91542f7450..aa813726733 100644
--- a/subprojects/docs/src/snippets/java/toolchain-filters/kotlin/build.gradle.kts
+++ b/subprojects/docs/src/snippets/java/toolchain-filters/kotlin/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
- vendor.set(JvmVendorSpec.ADOPTIUM)
}
}
// end::toolchain-known-vendor[]
--
2.40.0