From 32f8e94a15917bcc80df40c7a2f357970e333f60 Mon Sep 17 00:00:00 2001 From: Adam Semenenko <152864218+adam-enko@users.noreply.github.com> Date: Thu, 3 Jul 2025 08:44:35 +0200 Subject: [PATCH] Remove usage of internal Gradle API Gradle tasks should be subtypes of DefaultTask, not the internal `ConventionTask` --- atomicfu-gradle-plugin/api/atomicfu-gradle-plugin.api | 2 +- .../kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/atomicfu-gradle-plugin/api/atomicfu-gradle-plugin.api b/atomicfu-gradle-plugin/api/atomicfu-gradle-plugin.api index f70f4d3a..1df0510f 100644 --- a/atomicfu-gradle-plugin/api/atomicfu-gradle-plugin.api +++ b/atomicfu-gradle-plugin/api/atomicfu-gradle-plugin.api @@ -18,7 +18,7 @@ public final class kotlinx/atomicfu/plugin/gradle/AtomicFUPluginExtension { public final fun setVerbose (Z)V } -public abstract class kotlinx/atomicfu/plugin/gradle/AtomicFUTransformTask : org/gradle/api/internal/ConventionTask { +public abstract class kotlinx/atomicfu/plugin/gradle/AtomicFUTransformTask : org/gradle/api/DefaultTask { public field classPath Lorg/gradle/api/file/FileCollection; public field inputFiles Lorg/gradle/api/file/FileCollection; public fun ()V diff --git a/atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt b/atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt index bb9a521d..04b3254f 100644 --- a/atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt +++ b/atomicfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt @@ -7,7 +7,6 @@ package kotlinx.atomicfu.plugin.gradle import kotlinx.atomicfu.transformer.* import org.gradle.api.* import org.gradle.api.file.* -import org.gradle.api.internal.* import org.gradle.api.provider.Provider import org.gradle.api.provider.ProviderFactory import org.gradle.api.tasks.* @@ -74,8 +73,8 @@ private fun Project.checkCompatibility(afuPluginVersion: String) { ) } if (!kotlinVersion.atLeast(1, 9, 0)) { - // Since Kotlin 1.9.0 the logic of the Gradle plugin from the Kotlin repo (AtomicfuKotlinGradleSubplugin) - // may be moved to the Gradle plugin in the library. The sources of the compiler plugin + // Since Kotlin 1.9.0 the logic of the Gradle plugin from the Kotlin repo (AtomicfuKotlinGradleSubplugin) + // may be moved to the Gradle plugin in the library. The sources of the compiler plugin // are published as `kotlin-atomicfu-compiler-plugin-embeddable` since Kotlin 1.9.0 and may be accessed out of the Kotlin repo. error( "You are applying `kotlinx-atomicfu` plugin of version $afuPluginVersion. " + @@ -451,7 +450,7 @@ class AtomicFUPluginExtension(pluginVersion: String?) { } @CacheableTask -abstract class AtomicFUTransformTask : ConventionTask() { +abstract class AtomicFUTransformTask : DefaultTask() { @get:Inject internal abstract val providerFactory: ProviderFactory