aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Woitaschek <woitaschek@gmail.com>2023-09-05 12:33:30 +0200
committerlaszio <ting-yuan@users.noreply.github.com>2023-09-11 15:37:48 -0700
commite8e6e0e17e188672e42994c607ea72afb08110bb (patch)
tree22593f82155f14ac5cd906f6e97ef320d5e96a23
parentb96f0fffedfe281f0e7720a0cf7176678861cab0 (diff)
downloadksp-e8e6e0e17e188672e42994c607ea72afb08110bb.tar.gz
Manually compare by name when checking if a task should be enabled
This is a workaround for https://github.com/google/ksp/issues/1522 (cherry picked from commit d0b972dac7882b602a12ccc2689da7d4ede3eefa)
-rw-r--r--gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt8
1 files changed, 6 insertions, 2 deletions
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt
index 6be9ee3a..882ded5a 100644
--- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt
+++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KotlinFactories.kt
@@ -48,7 +48,6 @@ import org.jetbrains.kotlin.gradle.dsl.*
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationInfo
import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
-import org.jetbrains.kotlin.gradle.plugin.mpp.enabledOnCurrentHost
import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompileTool
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -59,6 +58,7 @@ import org.jetbrains.kotlin.gradle.tasks.configuration.BaseKotlin2JsCompileConfi
import org.jetbrains.kotlin.gradle.tasks.configuration.KotlinCompileCommonConfig
import org.jetbrains.kotlin.gradle.tasks.configuration.KotlinCompileConfig
import org.jetbrains.kotlin.incremental.ChangedFiles
+import org.jetbrains.kotlin.konan.target.HostManager
import java.io.File
import java.nio.file.Paths
import javax.inject.Inject
@@ -155,7 +155,11 @@ class KotlinFactories {
)
kspTask.onlyIf {
- kspTask.konanTarget.enabledOnCurrentHost
+ // kspTask.konanTarget.enabledOnCurrentHost
+ // workaround for: https://github.com/google/ksp/issues/1522
+ HostManager().enabled.any {
+ it.name == kspTask.konanTarget.name
+ }
}
}
}