Skip to content

Commit e13cd5d

Browse files
bnvinay92bnvinay92
committed
Migrate :workflow-core and :workflow-runtime to kmp gradle plugin
1 parent c6a202a commit e13cd5d

File tree

69 files changed

+133
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+133
-103
lines changed

‎.github/workflows/kotlin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs :
7878
gradle-dependencies-cache-key : |
7979
gradle/libs.versions.toml
8080
arguments : |
81-
test apiCheck artifactsCheck dependencyGuard lint ktlintCheck jmhJar --no-daemon --stacktrace --continue
81+
test apiCheck artifactsCheck dependencyGuard lint ktlintCheck jvmWorkflowNodeBenchmarkJar --no-daemon --stacktrace --continue
8282
concurrent : true
8383
gradle-build-scan-report : false
8484
gradle-distribution-sha-256-sum-warning : false

‎artifacts.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
{
1919
"gradlePath": ":workflow-core",
2020
"group": "com.squareup.workflow1",
21-
"artifactId": "workflow-core-jvm",
21+
"artifactId": "workflow-core",
2222
"description": "Workflow Core",
2323
"packaging": "jar",
2424
"javaVersion": "1.8"
2525
},
2626
{
2727
"gradlePath": ":workflow-runtime",
2828
"group": "com.squareup.workflow1",
29-
"artifactId": "workflow-runtime-jvm",
29+
"artifactId": "workflow-runtime",
3030
"description": "Workflow Runtime",
3131
"packaging": "jar",
3232
"javaVersion": "1.8"

‎build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
55
buildscript {
66
dependencies {
77
classpath(libs.android.gradle.plugin)
8-
classpath(libs.jmh.gradle.plugin)
8+
classpath(libs.kotlinx.benchmark.gradle.plugin)
99
classpath(libs.dokka.gradle.plugin)
1010
classpath(libs.kotlin.serialization.gradle.plugin)
1111
classpath(libs.kotlinx.binaryCompatibility.gradle.plugin)

‎dependencies/classpath.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ com.squareup.retrofit2:converter-moshi:2.9.0
7373
com.squareup.retrofit2:retrofit:2.9.0
7474
com.squareup:javapoet:1.10.0
7575
com.squareup:javawriter:2.5.0
76+
com.squareup:kotlinpoet:1.3.0
7677
com.sun.activation:javax.activation:1.2.0
7778
com.sun.istack:istack-commons-runtime:3.0.8
7879
com.sun.xml.fastinfoset:FastInfoset:1.2.16
@@ -104,7 +105,6 @@ it.unimi.dsi:fastutil:8.4.0
104105
jakarta.activation:jakarta.activation-api:1.2.1
105106
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2
106107
javax.inject:javax.inject:1
107-
me.champeau.gradle:jmh-gradle-plugin:0.5.3
108108
net.java.dev.jna:jna-platform:5.6.0
109109
net.java.dev.jna:jna:5.6.0
110110
net.sf.jopt-simple:jopt-simple:4.9
@@ -152,8 +152,10 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
152152
org.jetbrains.kotlin:kotlin-stdlib:1.5.31
153153
org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.10
154154
org.jetbrains.kotlin:kotlin-util-io:1.6.10
155+
org.jetbrains.kotlin:kotlin-util-klib-metadata:1.6.0
155156
org.jetbrains.kotlin:kotlin-util-klib:1.6.10
156157
org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0
158+
org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.4.2
157159
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.1
158160
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1
159161
org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.2.0
@@ -164,7 +166,7 @@ org.jlleitschuh.gradle:ktlint-gradle:10.3.0
164166
org.json:json:20180813
165167
org.jsoup:jsoup:1.13.1
166168
org.jvnet.staxex:stax-ex:1.8.1
167-
org.openjdk.jmh:jmh-core:1.27
169+
org.openjdk.jmh:jmh-core:1.21
168170
org.ow2.asm:asm-analysis:9.1
169171
org.ow2.asm:asm-commons:9.1
170172
org.ow2.asm:asm-tree:9.1

‎gradle/libs.versions.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ kotlin = "1.6.10"
5151
kotlinx-binary-compatibility = "0.6.0"
5252
kotlinx-coroutines = "1.5.1"
5353
kotlinx-serialization-json = "1.3.2"
54+
kotlinx-benchmark = "0.4.2"
5455

5556
ktlint = "10.3.0"
5657
material = "1.3.0"
@@ -93,6 +94,7 @@ google-ksp = { id = "com.google.devtools.ksp", version.ref = "google-ksp" }
9394

9495
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
9596
kotlinx-apiBinaryCompatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-binary-compatibility" }
97+
kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark" }
9698
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
9799
mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-publish" }
98100

@@ -164,11 +166,6 @@ hamcrest = "org.hamcrest:hamcrest-core:2.2"
164166

165167
jetbrains-annotations = "org.jetbrains:annotations:19.0.0"
166168

167-
jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
168-
jmh-generator = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
169-
170-
jmh-gradle-plugin = "me.champeau.gradle:jmh-gradle-plugin:0.5.3"
171-
172169
junit = { module = "junit:junit", version.ref = "jUnit" }
173170

174171
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
@@ -189,6 +186,8 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
189186
kotlinx-coroutines-rx2 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-rx2", version.ref = "kotlinx-coroutines" }
190187
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
191188
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
189+
kotlinx-benchmark-gradle-plugin = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-plugin", version.ref = "kotlinx-benchmark" }
190+
kotlinx-benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark" }
192191

193192
ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlint" }
194193

‎workflow-core/api/workflow-core.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public final class com/squareup/workflow1/WorkflowAction$Companion {
219219

220220
public final class com/squareup/workflow1/WorkflowAction$Updater {
221221
public fun <init> (Lcom/squareup/workflow1/WorkflowAction;Ljava/lang/Object;Ljava/lang/Object;)V
222-
public final fun getMaybeOutput$wf1_workflow_core ()Lcom/squareup/workflow1/WorkflowOutput;
222+
public final fun getMaybeOutput$workflow_core ()Lcom/squareup/workflow1/WorkflowOutput;
223223
public final fun getProps ()Ljava/lang/Object;
224224
public final fun getState ()Ljava/lang/Object;
225225
public final fun setOutput (Ljava/lang/Object;)V

‎workflow-core/build.gradle.kts

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,35 @@
11
plugins {
2-
`java-library`
3-
`kotlin-jvm`
2+
kotlin("multiplatform")
43
id("org.jetbrains.dokka")
54
}
65

6+
java {
7+
sourceCompatibility = JavaVersion.VERSION_1_8
8+
targetCompatibility = JavaVersion.VERSION_1_8
9+
}
10+
711
apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle"))
812

9-
dependencies {
10-
compileOnly(libs.jetbrains.annotations)
13+
kotlin {
14+
jvm { withJava() }
1115

12-
api(libs.kotlin.jdk6)
13-
api(libs.kotlinx.coroutines.core)
14-
// For Snapshot.
15-
api(libs.squareup.okio)
16+
sourceSets {
17+
val jvmMain by getting {
18+
dependencies {
19+
compileOnly(libs.jetbrains.annotations)
1620

17-
testImplementation(libs.kotlinx.coroutines.test)
18-
testImplementation(libs.kotlin.test.jdk)
21+
implementation(project.dependencies.platform(libs.kotlin.bom))
22+
api(libs.kotlin.jdk6)
23+
api(libs.kotlinx.coroutines.core)
24+
// For Snapshot.
25+
api(libs.squareup.okio)
26+
}
27+
}
28+
val jvmTest by getting {
29+
dependencies {
30+
implementation(libs.kotlinx.coroutines.test)
31+
implementation(libs.kotlin.test.jdk)
32+
}
33+
}
34+
}
1935
}

‎workflow-core/dependencies/jvmRuntimeClasspath.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
com.squareup.okio:okio-jvm:3.0.0
2+
com.squareup.okio:okio:3.0.0
3+
org.jetbrains.kotlin:kotlin-bom:1.6.10
4+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10
5+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10
6+
org.jetbrains.kotlin:kotlin-stdlib:1.6.10
7+
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.1
8+
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1
9+
org.jetbrains:annotations:13.0

‎workflow-core/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
POM_ARTIFACT_ID=workflow-core-jvm
1+
POM_ARTIFACT_ID=workflow-core
22
POM_NAME=Workflow Core
33
POM_PACKAGING=jar

‎workflow-core/src/main/baseline-prof.txt renamed to ‎workflow-core/src/jvmMain/baseline-prof.txt

File renamed without changes.

0 commit comments

Comments
 (0)