From d086fedffc0711588a1c1830df1c83cce2a8c583 Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Mon, 27 Jun 2022 12:48:06 +0200
Subject: [PATCH] [Gradle] Use FileCollection instead lambda + lazy in
 KotlinNativeToolRunner

FileCollection is lazy on its own.
---
 .../kotlin/compilerRunner/nativeToolRunners.kt    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt
index d5ad0beb16f..7335271668c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/nativeToolRunners.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.compilerRunner
 
 import org.gradle.api.Project
+import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.*
 import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
 import org.jetbrains.kotlin.gradle.dsl.NativeCacheKind
@@ -69,22 +70,16 @@ internal abstract class KotlinNativeToolRunner(
         val konanPropertiesFile: File,
         @get:Input
         val jvmArgs: List<String>,
-        classpathProvider: () -> Set<File>,
-    ) {
         @get:Classpath
-        val classpath by lazy(classpathProvider)
+        val classpath: FileCollection
+    ) {
 
         constructor(project: Project) : this(
             konanVersion = project.konanVersion,
             konanHome = project.konanHome,
             konanPropertiesFile = project.file("${project.konanHome}/konan/konan.properties"),
             jvmArgs = project.jvmArgs,
-            classpathProvider = {
-                project.files(
-                    project.kotlinNativeCompilerJar,
-                    "${project.konanHome}/konan/lib/trove4j.jar"
-                ).files
-            }
+            classpath = project.files(project.kotlinNativeCompilerJar, "${project.konanHome}/konan/lib/trove4j.jar")
         )
     }
 
@@ -115,7 +110,7 @@ internal abstract class KotlinNativeToolRunner(
         ).toMap()
     }
 
-    final override val classpath get() = settings.classpath
+    final override val classpath get() = settings.classpath.files
 
     final override fun checkClasspath() =
         check(classpath.isNotEmpty()) {