45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
From 7864aaa3d5dbccb0067df1fd5372042c1d95249a 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 3/3] 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>
|
|
---
|
|
.../main/kotlin/gradlebuild.unittest-and-compile.gradle.kts | 4 ----
|
|
.../snippets/java/toolchain-filters/kotlin/build.gradle.kts | 1 -
|
|
2 files changed, 5 deletions(-)
|
|
|
|
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 55d63762964..203cf2b7231 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
|
|
@@ -58,10 +58,6 @@ tasks.registerCITestDistributionLifecycleTasks()
|
|
fun configureCompile() {
|
|
java.toolchain {
|
|
languageVersion.set(JavaLanguageVersion.of(11))
|
|
- // Do not force Adoptium vendor for M1 Macs
|
|
- if (!OperatingSystem.current().toString().contains("aarch64")) {
|
|
- vendor.set(JvmVendorSpec.ADOPTIUM)
|
|
- }
|
|
}
|
|
|
|
tasks.withType<JavaCompile>().configureEach {
|
|
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 b6b13a6edaa..0d0b268c937 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.36.1
|
|
|