Remove kotlin-dsl.

Author: ychescale9

build.gradle.kts

@@ -6,7 +6,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    `kotlin-dsl`
+    `java-gradle-plugin`
+    alias(libs.plugins.kotlin.gradle.samWithReceiver)
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.binaryCompatibilityValidator)
     alias(libs.plugins.detekt)
@@ -21,6 +22,10 @@ mavenPublishing {
     signAllPublications()
 }
 
+samWithReceiver {
+    annotation(HasImplicitReceiver::class.qualifiedName!!)
+}
+
 gradlePlugin {
     website.set(property("POM_URL") as String)
     vcsUrl.set(property("POM_SCM_URL") as String)

gradle/libs.versions.toml

@@ -16,6 +16,7 @@ testParameterInjector = { group = "com.google.testparameterinjector", name = "te
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-gradle-samWithReceiver = { id = "org.jetbrains.kotlin.plugin.sam.with.receiver", version.ref = "kotlin" }
 binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompabilityValidator" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }

src/main/kotlin/io/github/reactivecircus/appversioning/AppVersioningExtension.kt

@@ -2,13 +2,13 @@ package io.github.reactivecircus.appversioning
 
 import groovy.lang.Closure
 import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.Property
 import org.gradle.api.provider.ProviderFactory
-import org.gradle.kotlin.dsl.property
 
 /**
  * Extension for [AppVersioningPlugin].
  */
-@Suppress("UnstableApiUsage", "unused")
+@Suppress("unused")
 open class AppVersioningExtension internal constructor(objects: ObjectFactory) {
 
     /**
@@ -125,5 +125,7 @@ open class AppVersioningExtension internal constructor(objects: ObjectFactory) {
     }
 }
 
+private inline fun <reified T : Any> ObjectFactory.property(): Property<T> = property(T::class.java)
+
 internal typealias VersionCodeCustomizer = (GitTag, ProviderFactory, VariantInfo) -> Int
 internal typealias VersionNameCustomizer = (GitTag, ProviderFactory, VariantInfo) -> String

src/main/kotlin/io/github/reactivecircus/appversioning/AppVersioningPlugin.kt

@@ -8,8 +8,6 @@ import io.github.reactivecircus.appversioning.tasks.PrintAppVersionInfo
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.TaskProvider
-import org.gradle.kotlin.dsl.getByType
-import org.gradle.kotlin.dsl.withType
 import org.gradle.language.nativeplatform.internal.BuildType
 import java.io.File
 import java.util.Locale
@@ -24,9 +22,9 @@ class AppVersioningPlugin : Plugin<Project> {
         val androidAppPluginApplied = AtomicBoolean(false)
         val pluginDisabled = AtomicBoolean(false)
         val appVersioningExtension = project.extensions.create("appVersioning", AppVersioningExtension::class.java)
-        project.plugins.withType<AppPlugin> {
+        project.plugins.withType(AppPlugin::class.java) {
             androidAppPluginApplied.set(true)
-            val extension = project.extensions.getByType<ApplicationAndroidComponentsExtension>()
+            val extension = project.extensions.getByType(ApplicationAndroidComponentsExtension::class.java)
             extension.onVariants(selector = extension.selector().all()) { variant ->
                 if (pluginDisabled.get()) return@onVariants
                 if (!appVersioningExtension.enabled.get()) {

src/main/kotlin/io/github/reactivecircus/appversioning/tasks/GenerateAppVersionInfo.kt

@@ -1,4 +1,4 @@
-@file:Suppress("UnstableApiUsage", "DuplicatedCode")
+@file:Suppress("DuplicatedCode")
 
 package io.github.reactivecircus.appversioning.tasks