azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made GradleCompileTaskProvder compative with configuration cache.

Browse Source 
After moving compilerRunner() method evaluation into execution phase,
creation of GradleCompileTaskProvider class started to violate
configuration cache.

^KT-45611 In Progress
This commit is contained in:
Yahor Berdnikau
2021-04-26 22:09:05 +02:00
committed by TeamCityServer
parent 816e955c61
commit 61825e9aec
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLinkWithWorkers.kt
+1 -1
View File
@@ -24,7 +24,7 @@ constructor(
javaExecutable: File,
jdkToolsJar: File?
) = GradleCompilerRunnerWithWorkers(
GradleCompileTaskProvider(this),
gradleCompileTaskProvider,
javaExecutable,
jdkToolsJar,
workerExecutor
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+13 -4
View File
@@ -332,11 +332,20 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> : AbstractKotl
}
)
// Moved creation here to not violate Gradle configuration cache as [compilerRunner] method is called
// at execution time
// by lazy is added so properties of task extending this one are captured - required for incremental
// compilation
@get:Internal
protected val gradleCompileTaskProvider by lazy {
GradleCompileTaskProvider(this)
}
internal open fun compilerRunner(
javaExecutable: File,
jdkToolsJar: File?
): GradleCompilerRunner = GradleCompilerRunner(
GradleCompileTaskProvider(this),
gradleCompileTaskProvider,
javaExecutable,
jdkToolsJar
)
@@ -623,7 +632,7 @@ internal open class KotlinCompileWithWorkers @Inject constructor(
javaExecutable: File,
jdkToolsJar: File?
) = GradleCompilerRunnerWithWorkers(
GradleCompileTaskProvider(this),
gradleCompileTaskProvider,
javaExecutable,
jdkToolsJar,
workerExecutor
@@ -640,7 +649,7 @@ internal open class Kotlin2JsCompileWithWorkers @Inject constructor(
javaExecutable: File,
jdkToolsJar: File?
) = GradleCompilerRunnerWithWorkers(
GradleCompileTaskProvider(this),
gradleCompileTaskProvider,
javaExecutable,
jdkToolsJar,
workerExecutor
@@ -655,7 +664,7 @@ internal open class KotlinCompileCommonWithWorkers @Inject constructor(
javaExecutable: File,
jdkToolsJar: File?
) = GradleCompilerRunnerWithWorkers(
GradleCompileTaskProvider(this),
gradleCompileTaskProvider,
javaExecutable,
jdkToolsJar,
workerExecutor