editing build so that

a) it can build gradle-plugin and compiler-plugin with bootstrap jars without mavenLocal.
b) bootstrap jars are updated before the actual build

Author: Jolanrensen

.github/workflows/build.yml

@@ -36,11 +36,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Publish plugins to maven local
+      - name: Build the plugins first
         run: >
           ./gradlew
-          compiler-plugin:publishToMavenLocal
-          gradle-plugin:publishToMavenLocal
+          updateBootstrapVersion
 
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v2

build.gradle.kts

@@ -12,6 +12,10 @@ buildscript {
     dependencies {
         classpath(jcp)
         classpath(mavenPublish)
+
+        // Allows the project to use the gradle plugin without mavenLocal
+        // Kept up-to-date by :gradle-plugin:updateBootstrapVersion
+        classpath(files("${project.rootDir.absolutePath}/gradle/bootstraps/gradle-plugin.jar"))
     }
 }
 
@@ -21,9 +25,6 @@ plugins {
     idea
     kotlin version Versions.kotlin apply false
     buildconfig version Versions.buildconfig apply false
-
-    // Needs to be installed in the local maven repository
-    kotlinSparkApi version Versions.kotlinSparkApiGradlePlugin apply false
 }
 
 group = Versions.groupID
@@ -125,6 +126,13 @@ allprojects {
 }
 
 subprojects {
+    // Adding the bootstraps directory to the repositories of the subprojects, so that
+    // the bootstrap version of compiler-plugin.jar can be found and used by the gradle-plugin
+    // without mavenLocal
+    repositories.flatDir {
+        dirs("${project.rootDir.absolutePath}/gradle/bootstraps")
+    }
+
     afterEvaluate {
         extensions.findByType<BuildConfigExtension>()?.apply {
             val projectVersion = Versions.project

buildSrc/src/main/kotlin/Helpers.kt

@@ -3,6 +3,7 @@ import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.dsl.DependencyHandler
 
 interface Dsl<T> {
+    @Suppress("UNCHECKED_CAST")
     operator fun invoke(block: T.() -> Unit) = block(this as T)
 }
 

compiler-plugin/build.gradle.kts

@@ -102,4 +102,25 @@ fun Test.setLibraryProperty(propName: String, jarName: String) {
         ?.absolutePath
         ?: return
     systemProperty(propName, path)
-}
+}
+
+/**
+ * Copies the built jar file to the gradle/bootstraps directory.
+ * This allows the project to use the compiler plugin without mavenLocal.
+ */
+val updateBootstrapVersion by tasks.creating(Copy::class) {
+    group = "build"
+    dependsOn(tasks.jar)
+
+    val jarFile = tasks.jar.get().outputs.files.files.single {
+        it.extension == "jar" && it.name.startsWith("compiler-plugin")
+    }
+    from(jarFile)
+    rename { "compiler-plugin.jar" }
+    into(project.rootDir.resolve("gradle/bootstraps"))
+    outputs.upToDateWhen { false }
+}
+
+tasks.build {
+    finalizedBy(updateBootstrapVersion)
+}

compiler-plugin/src/main/kotlin/org/jetbrains/kotlinx/spark/api/compilerPlugin/ir/DataClassSparkifyGenerator.kt

@@ -96,6 +96,7 @@ class DataClassSparkifyGenerator(
      * )
      * ```
      */
+    @OptIn(UnsafeDuringIrConstructionAPI::class)
     override fun visitProperty(declaration: IrProperty) {
         val origin = declaration.parent as? IrClass ?: return super.visitProperty(declaration)
         if (sparkifyAnnotationFqNames.none { origin.hasAnnotation(FqName(it)) })

examples/build.gradle.kts

@@ -1,17 +1,17 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    // Needs to be installed in the local maven repository
+    // Needs to be installed in the local maven repository or have the bootstrap jar on the classpath
     id("org.jetbrains.kotlinx.spark.api")
-    kotlin
+    kotlin("jvm")
 }
 
-//kotlinSparkApi {
-//    enabled = true
-//    sparkifyAnnotationFqNames = listOf(
-//        "org.jetbrains.kotlinx.spark.api.plugin.annotations.Sparkify",
-//    )
-//}
+kotlinSparkApi {
+    enabled = true
+    sparkifyAnnotationFqNames = listOf(
+        "org.jetbrains.kotlinx.spark.api.plugin.annotations.Sparkify",
+    )
+}
 
 group = Versions.groupID
 version = Versions.project

gradle-plugin/build.gradle.kts

@@ -49,13 +49,29 @@ dependencies {
     }
 }
 
-//tasks.withType<ShadowJar> {
-//    isZip64 = true
-//    archiveClassifier = ""
-//}
-
 kotlin {
     jvmToolchain {
         languageVersion = JavaLanguageVersion.of(Versions.jvmTarget)
     }
-}
+}
+
+/**
+ * Copies the built jar file to the gradle/bootstraps directory.
+ * This allows the project to use the gradle plugin without mavenLocal.
+ */
+val updateBootstrapVersion by tasks.creating(Copy::class) {
+    group = "build"
+    dependsOn(tasks.jar)
+
+    val jarFile = tasks.jar.get().outputs.files.files.single {
+        it.extension == "jar" && it.name.startsWith("gradle-plugin")
+    }
+    from(jarFile)
+    rename { "gradle-plugin.jar" }
+    into(project.rootDir.resolve("gradle/bootstraps"))
+    outputs.upToDateWhen { false }
+}
+
+tasks.build {
+    finalizedBy(updateBootstrapVersion)
+}

gradle/bootstraps/compiler-plugin.jar

@@ -1,10 +1,9 @@
-@file:Suppress("UnstableApiUsage", "NOTHING_TO_INLINE")
+@file:Suppress("UnstableApiUsage")
 
 import com.igormaznitsa.jcp.gradle.JcpTask
 import com.vanniktech.maven.publish.JavadocJar.Dokka
 import com.vanniktech.maven.publish.KotlinJvm
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     scala