Skip to content

Commit 1a7e2e8

Browse files
wenli-caiwenli-cai
authored
Merge branch 'main' into wenli/improve-visualizer
2 parents 74fdadf + bf6909f commit 1a7e2e8

File tree

118 files changed

+4495
-3260
lines changed

Some content is hidden

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

118 files changed

+4495
-3260
lines changed

‎.github/workflows/kotlin.yml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
- name: Checkout
173173
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
174174

175-
- name: Check with Gradle
175+
- name: Lint via gradle
176176
uses: ./.github/actions/gradle-task
177177
with:
178178
task: lint
@@ -187,7 +187,7 @@ jobs:
187187
- name: Checkout
188188
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
189189

190-
- name: Check with Gradle
190+
- name: allTests via gradle
191191
uses: ./.github/actions/gradle-task
192192
with:
193193
task: |
@@ -228,18 +228,24 @@ jobs:
228228
- name: Checkout
229229
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
230230

231-
- name: Check with Gradle
231+
- name: jvmTest via Gradle
232232
uses: ./.github/actions/gradle-task
233233
with:
234234
task: jvmTest --continue -Pworkflow.runtime=drainExclusive
235235
restore-cache-key: main-build-artifacts
236236

237+
- name: test via Gradle
238+
uses: ./.github/actions/gradle-task
239+
with:
240+
task: test --continue -Pworkflow.runtime=drainExclusive
241+
restore-cache-key: main-build-artifacts
242+
237243
# Report as GitHub Pull Request Check.
238244
- name: Publish Test Report
239245
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
240246
if: always() # always run even if the previous step fails
241247
with:
242-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
248+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
243249

244250
jvm-conflate-runtime-test:
245251
name: CSR JVM Tests
@@ -260,7 +266,7 @@ jobs:
260266
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
261267
if: always() # always run even if the previous step fails
262268
with:
263-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
269+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
264270

265271
jvm-stateChange-runtime-test:
266272
name: SCO JVM Tests
@@ -281,7 +287,7 @@ jobs:
281287
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
282288
if: always() # always run even if the previous step fails
283289
with:
284-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
290+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
285291

286292
jvm-stable-handlers-test:
287293
name: SEH JVM Tests
@@ -302,7 +308,7 @@ jobs:
302308
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
303309
if: always() # always run even if the previous step fails
304310
with:
305-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
311+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
306312

307313
jvm-partial-runtime-test:
308314
name: PTR JVM Tests
@@ -323,7 +329,7 @@ jobs:
323329
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
324330
if: always() # always run even if the previous step fails
325331
with:
326-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
332+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
327333

328334
jvm-conflate-stateChange-runtime-test:
329335
name: SCO, CSR JVM Tests
@@ -344,7 +350,7 @@ jobs:
344350
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
345351
if: always() # always run even if the previous step fails
346352
with:
347-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
353+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
348354

349355
jvm-conflate-partial-runtime-test:
350356
name: CSR, PTR JVM Tests
@@ -365,7 +371,7 @@ jobs:
365371
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
366372
if: always() # always run even if the previous step fails
367373
with:
368-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
374+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
369375

370376
jvm-conflate-drainExclusive-runtime-test:
371377
name: CSR, DEA JVM Tests
@@ -386,7 +392,7 @@ jobs:
386392
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
387393
if: always() # always run even if the previous step fails
388394
with:
389-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
395+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
390396

391397
jvm-stateChange-drainExclusive-runtime-test:
392398
name: SCO, DEA JVM Tests
@@ -407,7 +413,7 @@ jobs:
407413
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
408414
if: always() # always run even if the previous step fails
409415
with:
410-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
416+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
411417

412418
jvm-partial-drainExclusive-runtime-test:
413419
name: PTR, DEA JVM Tests
@@ -428,7 +434,7 @@ jobs:
428434
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
429435
if: always() # always run even if the previous step fails
430436
with:
431-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
437+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
432438

433439
jvm-conflate-stateChange-drainExclusive-runtime-test:
434440
name: SCO, CSR, DEA JVM Tests
@@ -449,7 +455,7 @@ jobs:
449455
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
450456
if: always() # always run even if the previous step fails
451457
with:
452-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
458+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
453459

454460
jvm-conflate-partial-drainExclusive-runtime-test:
455461
name: CSR, PTR, DEA JVM Tests
@@ -470,7 +476,7 @@ jobs:
470476
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
471477
if: always() # always run even if the previous step fails
472478
with:
473-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
479+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
474480

475481
jvm-all-runtime-test:
476482
name: ALL Optimizations JVM Tests
@@ -491,7 +497,7 @@ jobs:
491497
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # v4
492498
if: always() # always run even if the previous step fails
493499
with:
494-
report_paths: '**/build/test-results/jvmTest/TEST-*.xml'
500+
report_paths: '**/build/test-results/*[tT]est/TEST-*.xml'
495501

496502
ios-tests:
497503
name: iOS Tests

‎artifacts.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
[
2-
{
3-
"gradlePath": ":trace-encoder",
4-
"group": "com.squareup.workflow1",
5-
"artifactId": "trace-encoder",
6-
"description": "Trace Encoder",
7-
"packaging": "jar",
8-
"javaVersion": 8,
9-
"publicationName": "maven"
10-
},
112
{
123
"gradlePath": ":workflow-core",
134
"group": "com.squareup.workflow1",
@@ -148,7 +139,16 @@
148139
"group": "com.squareup.workflow1",
149140
"artifactId": "workflow-tracing",
150141
"description": "Workflow Tracing",
151-
"packaging": "jar",
142+
"packaging": "aar",
143+
"javaVersion": 8,
144+
"publicationName": "maven"
145+
},
146+
{
147+
"gradlePath": ":workflow-tracing-papa",
148+
"group": "com.squareup.workflow1",
149+
"artifactId": "workflow-tracing-papa",
150+
"description": "Workflow Tracing Papa",
151+
"packaging": "aar",
152152
"javaVersion": 8,
153153
"publicationName": "maven"
154154
},

‎benchmarks/dungeon-benchmark/build.gradle.kts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import com.rickbusarow.kgx.libsCatalog
22
import com.rickbusarow.kgx.version
33
import com.squareup.workflow1.buildsrc.internal.javaTarget
44
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
5+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
56

67
plugins {
78
id("com.android.test")
@@ -19,11 +20,6 @@ android {
1920
targetCompatibility = javaTargetVersion
2021
}
2122

22-
kotlinOptions {
23-
jvmTarget = javaTarget
24-
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
25-
}
26-
2723
defaultConfig {
2824
minSdk = 28
2925
targetSdk = libsCatalog.version("targetSdk").toInt()
@@ -44,6 +40,13 @@ android {
4440
experimentalProperties["android.experimental.self-instrumenting"] = true
4541
}
4642

43+
kotlin {
44+
compilerOptions {
45+
jvmTarget.set(JvmTarget.JVM_1_8)
46+
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
47+
}
48+
}
49+
4750
dependencies {
4851
implementation(libs.androidx.macro.benchmark)
4952
implementation(libs.androidx.test.espresso.core)

‎benchmarks/performance-poetry/complex-benchmark/build.gradle.kts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import com.rickbusarow.kgx.libsCatalog
22
import com.rickbusarow.kgx.version
33
import com.squareup.workflow1.buildsrc.internal.javaTarget
44
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
5+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
56

67
plugins {
78
id("com.android.test")
@@ -19,11 +20,6 @@ android {
1920
targetCompatibility = javaTargetVersion
2021
}
2122

22-
kotlinOptions {
23-
jvmTarget = javaTarget
24-
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
25-
}
26-
2723
defaultConfig {
2824
minSdk = 28
2925
targetSdk = libsCatalog.version("targetSdk").toInt()
@@ -53,6 +49,13 @@ android {
5349
experimentalProperties["android.experimental.self-instrumenting"] = true
5450
}
5551

52+
kotlin {
53+
compilerOptions {
54+
jvmTarget.set(JvmTarget.JVM_1_8)
55+
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
56+
}
57+
}
58+
5659
dependencies {
5760
implementation(libs.androidx.macro.benchmark)
5861
implementation(libs.androidx.test.espresso.core)

‎benchmarks/performance-poetry/complex-poetry/build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import com.rickbusarow.kgx.libsCatalog
22
import com.rickbusarow.kgx.version
3-
import com.squareup.workflow1.buildsrc.internal.javaTarget
43
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
4+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
55

66
plugins {
77
id("com.android.application")
@@ -16,10 +16,6 @@ android {
1616
targetCompatibility = javaTargetVersion
1717
}
1818

19-
kotlinOptions {
20-
jvmTarget = javaTarget
21-
}
22-
2319
defaultConfig {
2420
targetSdk = libsCatalog.version("targetSdk").toInt()
2521
minSdk = 29
@@ -51,6 +47,12 @@ android {
5147
namespace = "com.squareup.benchmarks.performance.complex.poetry"
5248
}
5349

50+
kotlin {
51+
compilerOptions {
52+
jvmTarget.set(JvmTarget.JVM_1_8)
53+
}
54+
}
55+
5456
dependencies {
5557
androidTestImplementation(libs.androidx.test.espresso.core)
5658
androidTestImplementation(libs.androidx.test.junit)

‎build-logic/settings.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
plugins {
22
// Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
3-
kotlin("jvm") version "2.0.21" apply false
3+
kotlin("jvm") version "2.1.21" apply false
44
}
55

66
dependencyResolutionManagement {
77

8-
@Suppress("UnstableApiUsage")
98
versionCatalogs {
109

1110
create("libs") {

‎build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ dependencies {
4949

5050
dokka {
5151
// This is the displayed name for the module, like in the Html sidebar.
52-
// artifact id: workflow-internal-testing-utils
53-
// path: internal-testing-utils
52+
// artifact id: workflow-config-android
53+
// path: workflow-config/config-android
5454
moduleName.set(
5555
provider {
5656
findProperty("POM_ARTIFACT_ID") as? String

0 commit comments

Comments
 (0)