From 090963cfb259a1c53755589fc53597b1a94f1555 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Fri, 22 May 2026 14:54:04 +0200 Subject: [PATCH] chore(build): Remove IDEA-316081 toolchain workaround The Gradle taskGraph workaround for the IntelliJ IDEA toolchain bug (IDEA-316081) is no longer needed. Co-Authored-By: Claude Opus 4.6 --- build.gradle.kts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6656e00e49a..423390432da 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -262,14 +262,6 @@ tasks.register("buildForCodeQL") { } } -// Workaround for https://youtrack.jetbrains.com/issue/IDEA-316081/Gradle-8-toolchain-error-Toolchain-from-executable-property-does-not-match-toolchain-from-javaLauncher-property-when-different -gradle.taskGraph.whenReady { - val task = this.allTasks.find { it.name.endsWith(".main()") } as? JavaExec - task?.let { - it.setExecutable(it.javaLauncher.get().executablePath.asFile.absolutePath) - } -} - /* * Adapted from https://github.com/androidx/androidx/blob/c799cba927a71f01ea6b421a8f83c181682633fb/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt#L524-L549 *