From 9fb10b6b5708aa99a6944ca64d946550e68187ab Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Wed, 30 Aug 2023 03:46:20 +0200
Subject: [PATCH] build: properly set jdk version
---
.../convention/src/main/kotlin/KotlinAndroidConvention.kt | 8 --------
gradle/convention/src/main/kotlin/KotlinConvention.kt | 8 --------
2 files changed, 16 deletions(-)
diff --git a/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt b/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt
index 14fe66759..0182e7b5d 100644
--- a/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt
+++ b/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt
@@ -21,14 +21,6 @@ class KotlinAndroidConvention : Plugin<Project> {
apply("com.google.devtools.ksp")
}
- val service = project.extensions.getByType<JavaToolchainService>()
- val customLauncher = service.launcherFor {
- languageVersion.set(JavaLanguageVersion.of(17))
- }
- tasks.withType<UsesKotlinJavaToolchain>().configureEach {
- kotlinJavaToolchain.toolchain.use(customLauncher)
- }
-
// Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
diff --git a/gradle/convention/src/main/kotlin/KotlinConvention.kt b/gradle/convention/src/main/kotlin/KotlinConvention.kt
index 33b80176b..79b5fb12d 100644
--- a/gradle/convention/src/main/kotlin/KotlinConvention.kt
+++ b/gradle/convention/src/main/kotlin/KotlinConvention.kt
@@ -26,14 +26,6 @@ class KotlinConvention : Plugin<Project> {
apply("com.google.devtools.ksp")
}
- val service = project.extensions.getByType<JavaToolchainService>()
- val customLauncher = service.launcherFor {
- languageVersion.set(JavaLanguageVersion.of(17))
- }
- tasks.withType<UsesKotlinJavaToolchain>().configureEach {
- kotlinJavaToolchain.toolchain.use(customLauncher)
- }
-
// Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
--
GitLab