Compose Multiplatform Support

artifacts.json

@@ -171,22 +171,67 @@
     "publicationName": "maven"
   },
   {
-    "gradlePath": ":workflow-ui:compose",
+    "gradlePath": ":workflow-ui:compose-tooling",
     "group": "com.squareup.workflow1",
-    "artifactId": "workflow-ui-compose",
-    "description": "Workflow UI Compose",
+    "artifactId": "workflow-ui-compose-tooling",
+    "description": "Workflow UI Compose Tooling",
     "packaging": "aar",
     "javaVersion": 8,
     "publicationName": "maven"
   },
   {
-    "gradlePath": ":workflow-ui:compose-tooling",
+    "gradlePath": ":workflow-ui:core",
     "group": "com.squareup.workflow1",
-    "artifactId": "workflow-ui-compose-tooling",
-    "description": "Workflow UI Compose Tooling",
-    "packaging": "aar",
+    "artifactId": "workflow-ui-core-iosarm64",
+    "description": "Workflow UI Core",
+    "packaging": "klib",
     "javaVersion": 8,
-    "publicationName": "maven"
+    "publicationName": "iosArm64"
+  },
+  {
+    "gradlePath": ":workflow-ui:core",
+    "group": "com.squareup.workflow1",
+    "artifactId": "workflow-ui-core-iossimulatorarm64",
+    "description": "Workflow UI Core",
+    "packaging": "klib",
+    "javaVersion": 8,
+    "publicationName": "iosSimulatorArm64"
+  },
+  {
+    "gradlePath": ":workflow-ui:core",
+    "group": "com.squareup.workflow1",
+    "artifactId": "workflow-ui-core-iosx64",
+    "description": "Workflow UI Core",
+    "packaging": "klib",
+    "javaVersion": 8,
+    "publicationName": "iosX64"
+  },
+  {
+    "gradlePath": ":workflow-ui:core",
+    "group": "com.squareup.workflow1",
+    "artifactId": "workflow-ui-core-js",
+    "description": "Workflow UI Core",
+    "packaging": "klib",
+    "javaVersion": 8,
+    "publicationName": "js"
+  },
+  {
+    "gradlePath": ":workflow-ui:core",
+    "group": "com.squareup.workflow1",
+    "artifactId": "workflow-ui-core-jvm",
+    "description": "Workflow UI Core",
+    "packaging": "jar",
+    "javaVersion": 8,
+    "publicationName": "jvm"
+  },
+  {
+    "gradlePath": ":workflow-ui:core",
+    "group": "com.squareup.workflow1",
+    "artifactId": "workflow-ui-core",
+    "description": "Workflow UI Core",
+    "packaging": "jar",
+    "javaVersion": 8,
+    "publicationName": "kotlinMultiplatform"
   },
   {
     "gradlePath": ":workflow-ui:core-android",

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

@@ -64,7 +64,7 @@ dependencies {
   api(project(":workflow-core"))
   api(project(":workflow-runtime"))
   api(project(":workflow-ui:core-android"))
-  api(project(":workflow-ui:core-common"))
+  api(project(":workflow-ui:core"))
 
   debugImplementation(libs.squareup.leakcanary.android)
 

build-logic/settings.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   // Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
-  kotlin("jvm") version "1.9.10" apply false
+  kotlin("jvm") version "1.9.24" apply false
 }
 
 dependencyResolutionManagement {

build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt

@@ -2,7 +2,7 @@ package com.squareup.workflow1.buildsrc
 
 import com.android.build.gradle.TestedExtension
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import com.rickbusarow.kgx.dependency
+import com.rickbusarow.kgx.library
 import com.rickbusarow.kgx.libsCatalog
 import com.squareup.workflow1.buildsrc.internal.implementation
 import com.squareup.workflow1.buildsrc.internal.invoke
@@ -31,8 +31,8 @@ class AndroidSampleAppPlugin : Plugin<Project> {
       implementation(target.project(":workflow-runtime"))
       implementation(target.project(":workflow-config:config-android"))
 
-      implementation(target.libsCatalog.dependency("androidx-appcompat"))
-      implementation(target.libsCatalog.dependency("timber"))
+      implementation(target.libsCatalog.library("androidx-appcompat"))
+      implementation(target.libsCatalog.library("timber"))
     }
   }
 }

build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidUiTestsPlugin.kt

@@ -1,7 +1,7 @@
 package com.squareup.workflow1.buildsrc
 
 import com.android.build.gradle.TestedExtension
-import com.rickbusarow.kgx.dependency
+import com.rickbusarow.kgx.library
 import com.rickbusarow.kgx.libsCatalog
 import com.squareup.workflow1.buildsrc.internal.androidTestImplementation
 import com.squareup.workflow1.buildsrc.internal.invoke
@@ -28,9 +28,9 @@ class AndroidUiTestsPlugin : Plugin<Project> {
     target.dependencies {
       androidTestImplementation(target.project(":workflow-ui:internal-testing-android"))
 
-      androidTestImplementation(target.libsCatalog.dependency("androidx-test-espresso-core"))
-      androidTestImplementation(target.libsCatalog.dependency("androidx-test-junit"))
-      androidTestImplementation(target.libsCatalog.dependency("squareup-leakcanary-instrumentation"))
+      androidTestImplementation(target.libsCatalog.library("androidx-test-espresso-core"))
+      androidTestImplementation(target.libsCatalog.library("androidx-test-junit"))
+      androidTestImplementation(target.libsCatalog.library("squareup-leakcanary-instrumentation"))
     }
   }
 }

build-logic/src/main/java/com/squareup/workflow1/buildsrc/ComposeUiTestsPlugin.kt

@@ -1,6 +1,6 @@
 package com.squareup.workflow1.buildsrc
 
-import com.rickbusarow.kgx.dependency
+import com.rickbusarow.kgx.library
 import com.rickbusarow.kgx.libsCatalog
 import com.squareup.workflow1.buildsrc.internal.androidTestImplementation
 import com.squareup.workflow1.buildsrc.internal.invoke
@@ -15,7 +15,7 @@ class ComposeUiTestsPlugin : Plugin<Project> {
     target.dependencies {
       androidTestImplementation(target.project(":workflow-ui:internal-testing-compose"))
 
-      androidTestImplementation(target.libsCatalog.dependency("androidx-compose-ui-test-junit4"))
+      androidTestImplementation(target.libsCatalog.library("androidx-compose-ui-test-junit4"))
     }
   }
 }

build-logic/src/main/java/com/squareup/workflow1/buildsrc/KotlinMultiplatformExtensions.kt

@@ -1,17 +1,12 @@
 package com.squareup.workflow1.buildsrc
 
-import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
-fun KotlinMultiplatformExtension.iosWithSimulatorArm64(target: Project) {
-  ios()
-  iosSimulatorArm64()
-
-  sourceSets.getByName("iosSimulatorArm64Main") {
-    it.dependsOn(sourceSets.getByName("iosMain"))
-  }
-  sourceSets.getByName("iosSimulatorArm64Test") {
-    it.dependsOn(sourceSets.getByName("iosTest"))
-  }
+fun KotlinMultiplatformExtension.iosTargets(): List<KotlinNativeTarget> {
+  return listOf(
+    iosX64(),
+    iosArm64(),
+    iosSimulatorArm64()
+  )
 }

build.gradle.kts

@@ -27,6 +27,7 @@ plugins {
   id("artifacts-check")
   id("dependency-guard")
   alias(libs.plugins.ktlint)
+  id("com.autonomousapps.dependency-analysis") version "1.32.0"
 }
 
 shardConnectedCheckTasks(project)

dependencies/classpath.txt

@@ -41,6 +41,11 @@ com.android.tools:sdk-common:31.1.2
 com.android.tools:sdklib:31.1.2
 com.android:signflinger:8.1.2
 com.android:zipflinger:8.1.2
+com.autonomousapps.dependency-analysis:com.autonomousapps.dependency-analysis.gradle.plugin:1.32.0
+com.autonomousapps:antlr:4.10.1.6
+com.autonomousapps:asm-relocated:9.6.0.1
+com.autonomousapps:dependency-analysis-gradle-plugin:1.32.0
+com.autonomousapps:graph-support:0.2
 com.dropbox.dependency-guard:dependency-guard:0.4.3
 com.fasterxml.jackson.core:jackson-annotations:2.12.7
 com.fasterxml.jackson.core:jackson-core:2.12.7
@@ -50,18 +55,21 @@ com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.7
 com.fasterxml.jackson.module:jackson-module-kotlin:2.12.7
 com.fasterxml.jackson:jackson-bom:2.12.7
 com.fasterxml.woodstox:woodstox-core:6.2.4
+com.github.ben-manes.caffeine:caffeine:3.1.8
 com.google.android:annotations:4.1.1.4
 com.google.api.grpc:proto-google-common-protos:2.0.1
 com.google.auto.value:auto-value-annotations:1.6.2
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.8.9
 com.google.crypto.tink:tink:1.7.0
 com.google.dagger:dagger:2.28.3
-com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.10-1.0.13
-com.google.errorprone:error_prone_annotations:2.11.0
+com.google.devtools.ksp:symbol-processing-api:1.9.24-1.0.20
+com.google.devtools.ksp:symbol-processing-common-deps:1.9.24-1.0.20
+com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.24-1.0.20
+com.google.errorprone:error_prone_annotations:2.26.1
 com.google.flatbuffers:flatbuffers-java:1.12.0
-com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:31.1-jre
+com.google.guava:failureaccess:1.0.2
+com.google.guava:guava:33.1.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jimfs:jimfs:1.1
@@ -75,14 +83,18 @@ com.rickbusarow.kgx:names:0.1.12
 com.rickbusarow.ktlint:com.rickbusarow.ktlint.gradle.plugin:0.2.2
 com.rickbusarow.ktlint:ktlint-gradle-plugin:0.2.2
 com.squareup.moshi:moshi-adapters:1.15.0
-com.squareup.moshi:moshi:1.15.0
+com.squareup.moshi:moshi-kotlin:1.15.1
+com.squareup.moshi:moshi:1.15.1
 com.squareup.okhttp3:okhttp:4.12.0
-com.squareup.okio:okio-jvm:3.6.0
-com.squareup.okio:okio:3.6.0
+com.squareup.okio:okio-bom:3.9.0
+com.squareup.okio:okio-jvm:3.9.0
+com.squareup.okio:okio:3.9.0
 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-jvm:1.15.1
+com.squareup:kotlinpoet:1.15.1
 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
@@ -91,6 +103,8 @@ com.vanniktech:nexus:0.27.0
 commons-codec:commons-codec:1.11
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.2
+dev.zacsweers.moshix:moshi-sealed-reflect:0.25.1
+dev.zacsweers.moshix:moshi-sealed-runtime:0.25.1
 io.github.java-diff-utils:java-diff-utils:4.12
 io.grpc:grpc-api:1.45.1
 io.grpc:grpc-context:1.45.1
@@ -126,50 +140,50 @@ org.apache.httpcomponents:httpmime:4.5.6
 org.bitbucket.b_c:jose4j:0.7.0
 org.bouncycastle:bcpkix-jdk15on:1.67
 org.bouncycastle:bcprov-jdk15on:1.67
-org.checkerframework:checker-qual:3.12.0
+org.checkerframework:checker-qual:3.42.0
 org.codehaus.mojo:animal-sniffer-annotations:1.19
 org.codehaus.woodstox:stax2-api:4.2.1
 org.glassfish.jaxb:jaxb-runtime:2.3.2
 org.glassfish.jaxb:txw2:2.3.2
 org.jdom:jdom2:2.0.6
-org.jetbrains.dokka:dokka-core:1.9.10
-org.jetbrains.dokka:dokka-gradle-plugin:1.9.10
+org.jetbrains.dokka:dokka-core:1.9.20
+org.jetbrains.dokka:dokka-gradle-plugin:1.9.20
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
-org.jetbrains.kotlin:kotlin-android-extensions:1.9.10
-org.jetbrains.kotlin:kotlin-bom:1.9.10
-org.jetbrains.kotlin:kotlin-build-tools-api:1.9.10
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.10
-org.jetbrains.kotlin:kotlin-compiler-runner:1.9.10
-org.jetbrains.kotlin:kotlin-daemon-client:1.9.10
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.10
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.10
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.10
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.10
-org.jetbrains.kotlin:kotlin-native-utils:1.9.10
-org.jetbrains.kotlin:kotlin-project-model:1.9.10
+org.jetbrains.kotlin:kotlin-android-extensions:1.9.24
+org.jetbrains.kotlin:kotlin-bom:1.9.24
+org.jetbrains.kotlin:kotlin-build-tools-api:1.9.24
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-compiler-runner:1.9.24
+org.jetbrains.kotlin:kotlin-daemon-client:1.9.24
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.24
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.24
+org.jetbrains.kotlin:kotlin-native-utils:1.9.24
+org.jetbrains.kotlin:kotlin-project-model:1.9.24
 org.jetbrains.kotlin:kotlin-reflect:1.9.10
-org.jetbrains.kotlin:kotlin-scripting-common:1.9.10
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.10
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.10
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.10
-org.jetbrains.kotlin:kotlin-serialization:1.9.10
+org.jetbrains.kotlin:kotlin-scripting-common:1.9.24
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.24
+org.jetbrains.kotlin:kotlin-serialization:1.9.24
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24
 org.jetbrains.kotlin:kotlin-stdlib:1.9.10
-org.jetbrains.kotlin:kotlin-tooling-core:1.9.10
-org.jetbrains.kotlin:kotlin-util-io:1.9.10
-org.jetbrains.kotlin:kotlin-util-klib:1.9.10
+org.jetbrains.kotlin:kotlin-tooling-core:1.9.24
+org.jetbrains.kotlin:kotlin-util-io:1.9.24
+org.jetbrains.kotlin:kotlin-util-klib:1.9.24
 org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.3
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.3
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3
-org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0
 org.jetbrains:annotations:13.0
 org.jvnet.staxex:stax-ex:1.8.1
 org.ow2.asm:asm-analysis:9.2

gradle.properties

@@ -30,3 +30,7 @@ SONATYPE_STAGING_PROFILE=com.squareup
 # we're only supporting IR for now.
 # For details see https://kotlinlang.org/docs/js-ir-compiler.html
 kotlin.js.compiler=ir
+
+# Compose Multiplatform
+org.jetbrains.compose.experimental.jscanvas.enabled=true
+dependency.analysis.print.build.health=true