From 105ae0fabe1b3985f9970de62fb4e6809ae970ec Mon Sep 17 00:00:00 2001 From: Aniokrait Date: Sat, 31 Aug 2024 15:43:36 +0900 Subject: [PATCH] Move notCompatibleWithConfigurationCache. --- .../droidkaigi/confsched/primitive/KmpKtorfitPlugin.kt | 9 --------- .../github/droidkaigi/confsched/primitive/KmpPlugin.kt | 6 ++++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpKtorfitPlugin.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpKtorfitPlugin.kt index 71f0ee6ba..1155da6f6 100644 --- a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpKtorfitPlugin.kt +++ b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpKtorfitPlugin.kt @@ -53,15 +53,6 @@ class KmpKtorfitPlugin : Plugin { add("ksp$it", libs.library("ktorfitKsp")) } } - - // https://github.com/DroidKaigi/conference-app-2024/issues/485#issuecomment-2304251937 - tasks.withType().configureEach { - notCompatibleWithConfigurationCache("Configuration chache not supported for a system property read at configuration time") - - } - tasks.withType().configureEach { - notCompatibleWithConfigurationCache("Configuration chache not supported for a system property read at configuration time") - } } } } diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpPlugin.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpPlugin.kt index 8eb1e44c5..7d21fc900 100644 --- a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpPlugin.kt +++ b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/KmpPlugin.kt @@ -1,5 +1,6 @@ package io.github.droidkaigi.confsched.primitive +import com.google.devtools.ksp.gradle.KspTaskNative import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure @@ -13,6 +14,11 @@ class KmpPlugin : Plugin { with(pluginManager) { apply("org.jetbrains.kotlin.multiplatform") + withPlugin(libs.plugin("kspGradlePlugin").pluginId) { + tasks.withType().configureEach { + notCompatibleWithConfigurationCache("Configuration chache not supported for a system property read at configuration time") + } + } } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java) { kotlinOptions.jvmTarget = "11"