Merge pull request #793 from bnvinay92/vn/p1-gradle

Pt. 1: Migrate :workflow-core and :workflow-runtime to kmp gradle plugin

Author: rjrjr

.github/workflows/kotlin.yml

@@ -78,7 +78,7 @@ jobs :
           gradle-dependencies-cache-key : |
             gradle/libs.versions.toml
           arguments : |
-            test apiCheck artifactsCheck dependencyGuard lint ktlintCheck jmhJar --no-daemon --stacktrace --continue
+            test apiCheck artifactsCheck dependencyGuard lint ktlintCheck jvmWorkflowNodeBenchmarkJar --no-daemon --stacktrace --continue
           concurrent : true
           gradle-build-scan-report : false
           gradle-distribution-sha-256-sum-warning : false

artifacts.json

@@ -18,15 +18,15 @@
   {
     "gradlePath": ":workflow-core",
     "group": "com.squareup.workflow1",
-    "artifactId": "workflow-core-jvm",
+    "artifactId": "workflow-core",
     "description": "Workflow Core",
     "packaging": "jar",
     "javaVersion": "1.8"
   },
   {
     "gradlePath": ":workflow-runtime",
     "group": "com.squareup.workflow1",
-    "artifactId": "workflow-runtime-jvm",
+    "artifactId": "workflow-runtime",
     "description": "Workflow Runtime",
     "packaging": "jar",
     "javaVersion": "1.8"

build.gradle.kts

@@ -5,7 +5,7 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 buildscript {
   dependencies {
     classpath(libs.android.gradle.plugin)
-    classpath(libs.jmh.gradle.plugin)
+    classpath(libs.kotlinx.benchmark.gradle.plugin)
     classpath(libs.dokka.gradle.plugin)
     classpath(libs.kotlin.serialization.gradle.plugin)
     classpath(libs.kotlinx.binaryCompatibility.gradle.plugin)

buildSrc/src/main/java/com/squareup/workflow1/buildsrc/KotlinCommonSettings.kt

@@ -11,12 +11,13 @@ val Project.isRunningFromIde
 
 @Suppress("SuspiciousCollectionReassignment")
 fun Project.kotlinCommonSettings(
-  compileTask: KotlinCompile
+  compileTask: KotlinCompile,
+  configuration: String = "implementation",
 ) {
 
   // force the same Kotlin version everywhere, including transitive dependencies
   dependencies {
-    "implementation"(platform(kotlin("bom")))
+    configuration(platform(kotlin("bom")))
   }
 
   compileTask.kotlinOptions {

buildSrc/src/main/java/kotlin-multiplatform.gradle.kts

@@ -15,5 +15,5 @@ tasks.withType<KotlinCompile> {
     jvmTarget = "1.8"
   }
 
-  project.kotlinCommonSettings(this)
+  project.kotlinCommonSettings(this, "commonMainImplementation")
 }

dependencies/classpath.txt

@@ -73,6 +73,7 @@ com.squareup.retrofit2:converter-moshi:2.9.0
 com.squareup.retrofit2:retrofit:2.9.0
 com.squareup:javapoet:1.10.0
 com.squareup:javawriter:2.5.0
+com.squareup:kotlinpoet:1.3.0
 com.sun.activation:javax.activation:1.2.0
 com.sun.istack:istack-commons-runtime:3.0.8
 com.sun.xml.fastinfoset:FastInfoset:1.2.16
@@ -104,7 +105,6 @@ it.unimi.dsi:fastutil:8.4.0
 jakarta.activation:jakarta.activation-api:1.2.1
 jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
 javax.inject:javax.inject:1
-me.champeau.gradle:jmh-gradle-plugin:0.5.3
 net.java.dev.jna:jna-platform:5.6.0
 net.java.dev.jna:jna:5.6.0
 net.sf.jopt-simple:jopt-simple:4.9
@@ -152,8 +152,10 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.10
 org.jetbrains.kotlin:kotlin-util-io:1.6.10
+org.jetbrains.kotlin:kotlin-util-klib-metadata:1.6.0
 org.jetbrains.kotlin:kotlin-util-klib:1.6.10
 org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0
+org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.4.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1
 org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.2.0
@@ -164,7 +166,7 @@ org.jlleitschuh.gradle:ktlint-gradle:10.3.0
 org.json:json:20180813
 org.jsoup:jsoup:1.13.1
 org.jvnet.staxex:stax-ex:1.8.1
-org.openjdk.jmh:jmh-core:1.27
+org.openjdk.jmh:jmh-core:1.21
 org.ow2.asm:asm-analysis:9.1
 org.ow2.asm:asm-commons:9.1
 org.ow2.asm:asm-tree:9.1

gradle/libs.versions.toml

@@ -51,6 +51,7 @@ kotlin = "1.6.10"
 kotlinx-binary-compatibility = "0.6.0"
 kotlinx-coroutines = "1.5.1"
 kotlinx-serialization-json = "1.3.2"
+kotlinx-benchmark = "0.4.2"
 
 ktlint = "10.3.0"
 material = "1.3.0"
@@ -92,6 +93,7 @@ google-ksp = { id = "com.google.devtools.ksp", version.ref = "google-ksp" }
 
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlinx-apiBinaryCompatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-binary-compatibility" }
+kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-publish" }
 
@@ -163,11 +165,6 @@ hamcrest = "org.hamcrest:hamcrest-core:2.2"
 
 jetbrains-annotations = "org.jetbrains:annotations:19.0.0"
 
-jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
-jmh-generator = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
-
-jmh-gradle-plugin = "me.champeau.gradle:jmh-gradle-plugin:0.5.3"
-
 junit = { module = "junit:junit", version.ref = "jUnit" }
 
 kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
@@ -188,6 +185,8 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
 kotlinx-coroutines-rx2 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-rx2", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
+kotlinx-benchmark-gradle-plugin = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-plugin", version.ref = "kotlinx-benchmark" }
+kotlinx-benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark" }
 
 ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlint" }
 

workflow-core/build.gradle.kts

@@ -1,19 +1,29 @@
 plugins {
-  `java-library`
-  `kotlin-jvm`
+  `kotlin-multiplatform`
   id("org.jetbrains.dokka")
 }
 
 apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle"))
 
-dependencies {
-  compileOnly(libs.jetbrains.annotations)
+kotlin {
+  jvm { withJava() }
 
-  api(libs.kotlin.jdk6)
-  api(libs.kotlinx.coroutines.core)
-  // For Snapshot.
-  api(libs.squareup.okio)
+  sourceSets {
+    val jvmMain by getting {
+      dependencies {
+        compileOnly(libs.jetbrains.annotations)
 
-  testImplementation(libs.kotlinx.coroutines.test)
-  testImplementation(libs.kotlin.test.jdk)
+        api(libs.kotlin.jdk6)
+        api(libs.kotlinx.coroutines.core)
+        // For Snapshot.
+        api(libs.squareup.okio)
+      }
+    }
+    val jvmTest by getting {
+      dependencies {
+        implementation(libs.kotlinx.coroutines.test)
+        implementation(libs.kotlin.test.jdk)
+      }
+    }
+  }
 }

workflow-core/dependencies/jvmRuntimeClasspath.txt

@@ -0,0 +1,9 @@
+com.squareup.okio:okio-jvm:3.0.0
+com.squareup.okio:okio:3.0.0
+org.jetbrains.kotlin:kotlin-bom:1.6.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10
+org.jetbrains.kotlin:kotlin-stdlib:1.6.10
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1
+org.jetbrains:annotations:13.0

workflow-core/gradle.properties

@@ -1,3 +1,3 @@
-POM_ARTIFACT_ID=workflow-core-jvm
+POM_ARTIFACT_ID=workflow-core
 POM_NAME=Workflow Core
 POM_PACKAGING=jar