File 0001-drop-setVendor-for-Java.patch of Package gradle

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-drop-setVendor-for-Java.patch of Package gradle

From 3726c39808cb0b2c656f5fae920b16b4e9009fea 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/code-quality-rules/build.gradle.kts          | 1 -
 build-logic-commons/commons/build.gradle.kts                     | 1 -
 build-logic-commons/commons/src/main/kotlin/common.kt            | 1 -
 build-logic-commons/gradle-plugin/build.gradle.kts               | 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 -
 7 files changed, 7 deletions(-)

diff --git a/build-logic-commons/code-quality-rules/build.gradle.kts b/build-logic-commons/code-quality-rules/build.gradle.kts
index c92b3824551..9d6222c3b3a 100644
--- a/build-logic-commons/code-quality-rules/build.gradle.kts
+++ b/build-logic-commons/code-quality-rules/build.gradle.kts
@@ -25,7 +25,6 @@ description = "Provides a custom CodeNarc rule used by the Gradle build"
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(11))
-        vendor.set(JvmVendorSpec.ADOPTIUM)
     }
 }
 
diff --git a/build-logic-commons/commons/build.gradle.kts b/build-logic-commons/commons/build.gradle.kts
index 0b94c2b49f2..47759afe78d 100644
--- a/build-logic-commons/commons/build.gradle.kts
+++ b/build-logic-commons/commons/build.gradle.kts
@@ -9,6 +9,5 @@ description = "Provides common code used to create a Gradle plugin with Groovy o
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(11))
-        vendor.set(JvmVendorSpec.ADOPTIUM)
     }
 }
diff --git a/build-logic-commons/commons/src/main/kotlin/common.kt b/build-logic-commons/commons/src/main/kotlin/common.kt
index e02e6f21092..c1f4c5b55ab 100644
--- a/build-logic-commons/commons/src/main/kotlin/common.kt
+++ b/build-logic-commons/commons/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-commons/gradle-plugin/build.gradle.kts b/build-logic-commons/gradle-plugin/build.gradle.kts
index 8d5d0b3e2cb..4badb79a965 100644
--- a/build-logic-commons/gradle-plugin/build.gradle.kts
+++ b/build-logic-commons/gradle-plugin/build.gradle.kts
@@ -9,7 +9,6 @@ description = "Provides plugins used to create a Gradle plugin with Groovy or Ko
 java {
     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 761a08eccac..82ae640a8a5 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 82d95a0e803..d62e4e7eaa4 100644
--- a/subprojects/docs/src/snippets/java/toolchain-filters/groovy/build.gradle
+++ b/subprojects/docs/src/snippets/java/toolchain-filters/groovy/build.gradle
@@ -10,7 +10,6 @@ if (testToolchain == "knownVendor") {
 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 95d320baa0f..0c4f593c861 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
@@ -11,7 +11,6 @@ if (testToolchain == "knownVendor") {
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(11))
-        vendor.set(JvmVendorSpec.ADOPTIUM)
     }
 }
 // end::toolchain-known-vendor[]
-- 
2.40.0

Places

File 0001-drop-setVendor-for-Java.patch of Package gradle

Places