Finish Kotlin migration

.editorconfig

@@ -7,9 +7,6 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{groovy,java}]
-indent_size = 4
-
 [*.{kt,kts}]
 ij_kotlin_imports_layout = *
 ij_kotlin_allow_trailing_comma = true

build-logic/build.gradle.kts

@@ -10,6 +10,7 @@ repositories {
 dependencies {
   implementation("com.gradle.publish:plugin-publish-plugin:1.3.0")
   implementation("com.vanniktech:gradle-maven-publish-plugin:0.30.0")
+  implementation("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.20")
   implementation("org.ajoberstar.git-publish:gradle-git-publish:4.2.2")
   implementation("com.github.node-gradle:gradle-node-plugin:7.1.0")
 }

build-logic/src/main/kotlin/shadow.convention.deploy.gradle.kts

@@ -11,7 +11,7 @@ gitPublish {
   contents {
     from("build/site")
     into("api") {
-      from(tasks.named("groovydoc"))
+      from(tasks.named("dokkaHtml"))
     }
     filter<ReplaceTokens>(
       "tokens" to mapOf(
@@ -33,5 +33,5 @@ val yarnBuild = tasks.named("yarn_build") {
 }
 
 tasks.gitPublishCopy {
-  dependsOn(yarnBuild, tasks.named("groovydoc"))
+  dependsOn(yarnBuild, tasks.named("dokkaHtml"))
 }

build-logic/src/main/kotlin/shadow.convention.publish.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
   id("com.gradle.plugin-publish")
   id("com.vanniktech.maven.publish")
+  id("org.jetbrains.dokka")
 }
 
 version = providers.gradleProperty("VERSION_NAME").get()
@@ -36,16 +37,6 @@ tasks.publishPlugins {
   notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/21283")
 }
 
-tasks.withType<Javadoc>().configureEach {
-  (options as? StandardJavadocDocletOptions)?.let {
-    it.links(
-      "https://docs.oracle.com/en/java/javase/17/docs/api/",
-      "https://docs.groovy-lang.org/2.4.7/html/gapi/",
-    )
-    it.addStringOption("Xdoclint:none", "-quiet")
-  }
-}
-
 configurations {
   listOf(
     apiElements,

build.gradle.kts

@@ -3,8 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
   kotlin("jvm") version "2.0.21"
-  groovy
-  `java-gradle-plugin`
+  groovy // Required for Spock tests.
   id("shadow.convention.publish")
   id("shadow.convention.deploy")
   id("com.diffplug.spotless") version "7.0.0.BETA4"
@@ -16,6 +15,7 @@ java {
 }
 
 kotlin {
+  explicitApi()
   compilerOptions {
     // https://docs.gradle.org/current/userguide/compatibility.html#kotlin
     apiVersion = KotlinVersion.KOTLIN_1_8
@@ -27,6 +27,9 @@ kotlin {
 }
 
 spotless {
+  kotlin {
+    ktlint()
+  }
   kotlinGradle {
     ktlint()
     target("**/*.kts")
@@ -35,9 +38,6 @@ spotless {
 }
 
 dependencies {
-  compileOnly(localGroovy())
-  implementation(projects.api)
-
   implementation("org.jdom:jdom2:2.0.6.1")
   implementation("org.ow2.asm:asm-commons:9.7.1")
   implementation("commons-io:commons-io:2.18.0")

settings.gradle.kts

@@ -30,6 +30,3 @@ dependencyResolutionManagement {
 rootProject.name = "shadow"
 
 enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
-enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-
-include(":api")

src/docs/changes/README.md

@@ -3,6 +3,10 @@
 
 ## [Unreleased]
 
+**Changed**
+
+- **BREAKING CHANGE:** Rewrite this plugin in Kotlin. ([#1012](https://github.com/GradleUp/shadow/pull/1012))
+
 **Removed**
 
 - **BREAKING CHANGE:** Remove Develocity integration. ([#1013](https://github.com/GradleUp/shadow/pull/1013))

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy

@@ -82,8 +82,6 @@ class ShadowPluginSpec extends PluginSpecification {
         when:
         run(['shadowJar']) {
             it.withGradleVersion(version)
-            it.withDebug(true)
-            it.withTestKitDir(getTestKitDir())
         }
 
         then:
@@ -108,8 +106,6 @@ class ShadowPluginSpec extends PluginSpecification {
         expect:
         runWithFailure(['shadowJar']) {
             it.withGradleVersion('7.0')
-            it.withDebug(true)
-            it.withTestKitDir(getTestKitDir())
         }
     }
 
@@ -387,7 +383,7 @@ class ShadowPluginSpec extends PluginSpecification {
             package client;
             import junit.framework.TestCase;
             public class Client extends TestCase {
-                public static void main(String[] args) {} 
+                public static void main(String[] args) {}
             }
         """.stripIndent()
 
@@ -1029,7 +1025,7 @@ class ShadowPluginSpec extends PluginSpecification {
             version = '1.0'
             repositories { maven { url "${repo.uri}" } }
             dependencies { api project(':api') }
-            
+
             shadowJar.minimize()
         """.stripIndent()
 

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/util/PluginSpecification.groovy

@@ -58,6 +58,7 @@ abstract class PluginSpecification extends Specification {
                 .withProjectDir(dir.toFile())
                 .forwardOutput()
                 .withPluginClasspath()
+                .withTestKitDir(testKitDir)
     }
 
     GradleRunner runner(Collection<String> tasks) {
@@ -177,7 +178,7 @@ abstract class PluginSpecification extends Specification {
         return new File(this.class.classLoader.getResource(name).toURI())
     }
 
-    static File getTestKitDir() {
+    protected static File getTestKitDir() {
         def gradleUserHome = System.getenv("GRADLE_USER_HOME")
         if (!gradleUserHome) {
             gradleUserHome = new File(System.getProperty("user.home"), ".gradle").absolutePath