Update after isolating compiler plugins (#48)

* Update after isolating compiler plugins

* Clean old documentation

Author: rachelcarmena

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
         ./gradlew clean build
         java -jar use-plugin/build/libs/use-plugin.jar
     - name: "Build example: use of Arrow Meta Compiler Plugin with Gradle Plugin"
-      working-directory: use-arrow-meta-compiler-plugin
+      working-directory: use-arrow-meta-compiler-plugins
       run: ./gradlew clean build
     - name: "Build example: create new plugin to generate sources"
       working-directory: generate-sources

README.md

@@ -52,23 +52,19 @@ cd hello-world
 java -jar use-plugin/build/libs/use-plugin.jar
 ```
 
-## Hello World Compiler + IDE Plugin
-
-Stay tuned!
-
 ## Use of Λrrow Meta Compiler Plugin
 
 Λrrow Meta Compiler Plugin can be used through Λrrow Meta Gradle Plugin.
 
 ### How to run it from IDE
 
-1. Create a new project from existing sources: `use-arrow-meta-compiler-plugin` directory
+1. Create a new project from existing sources: `use-arrow-meta-compiler-plugins` directory
 2. Build project to run the test
 
 ### How to run it from command line
 
 ```
-cd use-arrow-meta-compiler-plugin
+cd use-arrow-meta-compiler-plugins
 ./gradlew clean build
 ```
 

generate-sources/gradle.properties

@@ -1,3 +1,5 @@
-KOTLIN_VERSION=1.5.0-RC
+KOTLIN_VERSION=1.5.0
 JVM_TARGET_VERSION=1.8
-ARROW_META_VERSION=1.5.0-RC-SNAPSHOT
+ARROW_META_VERSION=1.5.0-SNAPSHOT
+JUNIT_VERSION=5.7.0
+ASSERTJ_VERSION=3.17.2

generate-sources/create-plugin/build.gradle renamed to generate-sources/new-plugin/build.gradle

@@ -22,22 +22,11 @@ plugins {
 
 dependencies {
     compileOnly "org.jetbrains.kotlin:kotlin-compiler-embeddable:$KOTLIN_VERSION"
-    compileOnly "io.arrow-kt:compiler-plugin:$ARROW_META_VERSION"
+    compileOnly "io.arrow-kt:compiler-plugin-core:$ARROW_META_VERSION"
 }
 
 compileKotlin {
     kotlinOptions {
         jvmTarget = "$JVM_TARGET_VERSION"
     }
-}
-
-// Add new content to the default jar artifact: Arrow Meta Compiler Plugin except META-INF file to use the new one
-jar {
-    from (
-       zipTree(sourceSets.main.compileClasspath.find {
-           it.absolutePath.contains(Paths.get("arrow-kt","compiler-plugin").toString())
-       })
-    ) {
-        exclude 'META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar'
-    }
-}
+}

generate-sources/create-plugin/src/main/kotlin/io/arrowkt/example/MetaPlugin.kt renamed to generate-sources/new-plugin/src/main/kotlin/io/arrowkt/example/MetaPlugin.kt

@@ -26,15 +26,15 @@ val Meta.transformNewSources: CliPlugin
       classDeclaration(this, { name == "NewMultipleSource" }) {
         Transform.newSources(
           """
-            package arrow
-
-            class ${name}_Generated
-          """.file("${name}_Generated"), // default path: generated/source/kapt/main
+          |package arrow
+          |         
+          |class ${name}_Generated
+          """.trimMargin().file("${name}_Generated"), // default path: generated/source/kapt/main
           """
-            package arrow
-
-            class ${name}_Generated_2
-          """.file("${name}_Generated_2", "generated/custom/directory")
+          |package arrow
+          |
+          |class ${name}_Generated_2
+          """.trimMargin().file("${name}_Generated_2", "generated/custom/directory")
         )
       }
     )

generate-sources/create-plugin/src/main/kotlin/io/arrowkt/example/TransformNewSources.kt renamed to generate-sources/new-plugin/src/main/kotlin/io/arrowkt/example/TransformNewSources.kt

@@ -1,2 +1,2 @@
-include ':create-plugin'
+include ':new-plugin'
 include ':use-plugin'

generate-sources/create-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar renamed to generate-sources/new-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar

@@ -14,15 +14,32 @@
  * limitations under the License.
  */
 
+buildscript {
+    repositories {
+        maven {
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        }
+    }
+    dependencies {
+        classpath "io.arrow-kt:gradle-plugin:$ARROW_META_VERSION"
+    }
+}
+
 plugins {
     id "org.jetbrains.kotlin.jvm"
 }
 
+apply plugin: "io.arrow-kt.arrow"
+
+arrowMeta.plugins = ["${rootDir}/new-plugin/build/libs/new-plugin.jar".toString()]
+
+dependencies {
+    testImplementation "org.junit.jupiter:junit-jupiter:$JUNIT_VERSION"
+}
+
 compileKotlin {
     kotlinOptions {
         jvmTarget = "$JVM_TARGET_VERSION"
-        freeCompilerArgs = ["-Xplugin=${rootDir}/create-plugin/build/libs/create-plugin.jar",
-        "-P", "plugin:arrow.meta.plugin.compiler:generatedSrcOutputDir=${buildDir}"]
     }
 }
 
@@ -32,6 +49,10 @@ compileTestKotlin {
     }
 }
 
+test {
+    useJUnitPlatform()
+}
+
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-    compileTask -> compileTask.dependsOn ":create-plugin:assemble"
+    compileTask -> compileTask.dependsOn ":new-plugin:assemble"
 }

generate-sources/settings.gradle

@@ -0,0 +1,17 @@
+package io.arrowkt.example
+
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import java.nio.file.Paths
+import kotlin.io.path.exists
+
+
+class NewMultipleSourceTests {
+  @Test
+  fun `multiple sources are created`() {
+    val generatedDirPath = Paths.get(System.getProperty("user.dir"), "build", "generated")
+
+    assertTrue(Paths.get(generatedDirPath.toString(), "source", "kapt", "main", "NewMultipleSource_Generated.kt").exists())
+    assertTrue(Paths.get(generatedDirPath.toString(), "custom", "directory", "NewMultipleSource_Generated_2.kt").exists())
+  }
+}