From 7d96623c3760e07c1bec43c4562d92f63b365a6d Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Fri, 25 Aug 2023 12:42:20 +0200
Subject: [PATCH] Build: Extract toolchain resolve into a separate task

 #KTI-72
---
 .../main/kotlin/resolve-dependencies.gradle.kts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/resolve-dependencies.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/resolve-dependencies.gradle.kts
index 68042d07c1f..2371e0e16e0 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/resolve-dependencies.gradle.kts
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/resolve-dependencies.gradle.kts
@@ -22,12 +22,6 @@ tasks.register("resolveDependencies") {
 
             configurations.findByName("commonCompileClasspath")?.resolve()
 
-            plugins.withId("java-base") {
-                val service = project.extensions.getByType<JavaToolchainService>()
-                val javaExtension = extensions.getByType<JavaPluginExtension>()
-                service.compilerFor(javaExtension.toolchain).get()
-            }
-
             project.extensions.findByType<SpdxSbomExtension>()?.run {
                 targets.forEach { target ->
                     target.configurations.get().forEach { configurationName ->
@@ -75,4 +69,15 @@ tasks.register("resolveDependencies") {
             }
         }
     }
+}
+
+tasks.register("resolveToolchains") {
+    allprojects {
+        logger.info("Resolving toolchains in $this")
+        plugins.withId("java-base") {
+            val service = project.extensions.getByType<JavaToolchainService>()
+            val javaExtension = extensions.getByType<JavaPluginExtension>()
+            service.compilerFor(javaExtension.toolchain).get()
+        }
+    }
 }
\ No newline at end of file