From 70ea57380af61591abfb6a14e1b6ccbf719f92b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Doln=C3=ADk?= Date: Mon, 3 Jun 2024 13:25:45 +0200 Subject: [PATCH] Fix support for configuration cache in Gradle < 8.3. --- .../plugin/configuration/CreateSkieConfigurationTask.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt b/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt index bda1a3cca..2ac12fee5 100644 --- a/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt +++ b/SKIE/skie-gradle/plugin-impl/src/common/kotlin/co/touchlab/skie/plugin/configuration/CreateSkieConfigurationTask.kt @@ -49,8 +49,15 @@ abstract class CreateSkieConfigurationTask : DefaultTask() { dependsOn(target.createSkieBuildDirectoryTask) } + val createConfigurationOutputs = createConfiguration.map { it.outputs.files } + target.task.configure { - inputs.files(createConfiguration) + // Needed because of a bug in the configuration cache prior to Gradle 8.3 + // TODO Replace once we set the minimum required Gradle version >= 8.3 which will happen once we drop support for Kotlin 1.9.x + inputs.files(createConfigurationOutputs) + dependsOn(createConfiguration) + // With: + // inputs.files(createConfiguration) } } }