diff --git a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts b/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts index 8a498a86e..b0916a387 100644 --- a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts +++ b/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts @@ -44,7 +44,7 @@ android { } // Unclear: there are kotlin_builtins duplication between 1.5.20 and 1.6.10? - packagingOptions { + packaging { resources.excludes.add("**/*.kotlin_*") } diff --git a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts index a228c7cfc..274a83cab 100644 --- a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts +++ b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts @@ -44,7 +44,7 @@ android { } // Collisions in packaging. - packagingOptions { + packaging { resources.excludes.add("META-INF/AL2.0") resources.excludes.add("META-INF/LGPL2.1") } diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 97f2d7155..11f864471 100644 --- a/build-logic/settings.gradle.kts +++ b/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 { diff --git a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt index eef6fcb5f..d9a93f538 100644 --- a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt +++ b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt @@ -3,6 +3,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 +32,8 @@ class AndroidSampleAppPlugin : Plugin { 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")) } } } diff --git a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidUiTestsPlugin.kt b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidUiTestsPlugin.kt index 9f7b996e1..4ac8641e4 100644 --- a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidUiTestsPlugin.kt +++ b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidUiTestsPlugin.kt @@ -2,6 +2,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 +29,9 @@ class AndroidUiTestsPlugin : Plugin { 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")) } } } diff --git a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/ComposeUiTestsPlugin.kt b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/ComposeUiTestsPlugin.kt index 113a34b47..90a3b4f8e 100644 --- a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/ComposeUiTestsPlugin.kt +++ b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/ComposeUiTestsPlugin.kt @@ -1,6 +1,7 @@ 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 +16,7 @@ class ComposeUiTestsPlugin : Plugin { 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")) } } } diff --git a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/KotlinMultiplatformExtensions.kt b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/KotlinMultiplatformExtensions.kt index 1d1427803..2c44a72d6 100644 --- a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/KotlinMultiplatformExtensions.kt +++ b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/KotlinMultiplatformExtensions.kt @@ -1,17 +1,9 @@ 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 -fun KotlinMultiplatformExtension.iosWithSimulatorArm64(target: Project) { - ios() +fun KotlinMultiplatformExtension.iosWithSimulatorArm64() { + iosX64() + iosArm64() iosSimulatorArm64() - - sourceSets.getByName("iosSimulatorArm64Main") { - it.dependsOn(sourceSets.getByName("iosMain")) - } - sourceSets.getByName("iosSimulatorArm64Test") { - it.dependsOn(sourceSets.getByName("iosTest")) - } } diff --git a/build.gradle.kts b/build.gradle.kts index ada8fa044..eb6d11a8a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -137,6 +137,6 @@ tasks.register("siteDokka") { // Copy the files instead of configuring a different output directory on the dokka task itself // since the default output directories disambiguate between different types of outputs, and our // custom directory doesn't. - from(buildDir.resolve("dokka/htmlMultiModule/workflow")) - into(buildDir.resolve("dokka/workflow")) + from(layout.buildDirectory.file("dokka/htmlMultiModule/workflow")) + into(layout.buildDirectory.file("dokka/workflow")) } diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt index 9b8cbf21f..6f5edc484 100644 --- a/dependencies/classpath.txt +++ b/dependencies/classpath.txt @@ -57,7 +57,9 @@ 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.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.11.0 com.google.flatbuffers:flatbuffers-java:1.12.0 com.google.guava:failureaccess:1.0.1 @@ -135,36 +137,36 @@ 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.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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9f44e0d82..2fd07d6fb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,14 +13,14 @@ androidx-activity = "1.6.1" androidx-appcompat = "1.6.1" androidx-benchmark = "1.2.3" androidx-cardview = "1.0.0" -androidx-compose-compiler = "1.5.3" +androidx-compose-compiler = "1.5.14" # see https://developer.android.com/jetpack/compose/bom/bom-mapping -androidx-compose-bom = "2023.01.00" +androidx-compose-bom = "2024.09.02" androidx-constraintlayout = "2.1.4" androidx-core = "1.12.0" androidx-fragment = "1.3.6" androidx-gridlayout = "1.0.0" -androidx-lifecycle = "2.6.1" +androidx-lifecycle = "2.8.7" androidx-navigation = "2.4.0-alpha09" androidx-paging = "3.0.1" androidx-profileinstaller = "1.2.0-alpha02" @@ -42,7 +42,7 @@ dependencyGuard = "0.4.3" google-accompanist = "0.18.0" google-dagger = "2.40.5" -google-ksp = "1.9.10-1.0.13" +google-ksp = "1.9.24-1.0.20" google-material = "1.4.0" groovy = "3.0.9" @@ -53,7 +53,7 @@ kgx = "0.1.12" kotest = "5.1.0" # Keep this in sync with what is hard-coded in build-logic/settings.gradle.kts as that is upstream # of loading the library versions from this file but should be the same. -kotlin = "1.9.10" +kotlin = "1.9.24" kotlinx-binary-compatibility = "0.13.2" kotlinx-coroutines = "1.7.3" @@ -120,9 +120,9 @@ androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", ver androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" } -androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } +androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } androidx-compose-material = { module = "androidx.compose.material:material" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } @@ -145,6 +145,7 @@ androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref androidx-gridlayout = { module = "androidx.gridlayout:gridlayout", version.ref = "androidx-gridlayout" } androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" } +androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } androidx-lifecycle-core = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" } androidx-lifecycle-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-testing = { module = "androidx.lifecycle:lifecycle-runtime-testing", version.ref = "androidx-lifecycle" } diff --git a/internal-testing-utils/dependencies/runtimeClasspath.txt b/internal-testing-utils/dependencies/runtimeClasspath.txt index a689dbdb0..0b32e703e 100644 --- a/internal-testing-utils/dependencies/runtimeClasspath.txt +++ b/internal-testing-utils/dependencies/runtimeClasspath.txt @@ -1,6 +1,5 @@ -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +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.24 org.jetbrains:annotations:13.0 diff --git a/samples/compose-samples/src/main/java/com/squareup/sample/compose/inlinerendering/InlineRenderingWorkflow.kt b/samples/compose-samples/src/main/java/com/squareup/sample/compose/inlinerendering/InlineRenderingWorkflow.kt index 17ca749d2..5f54b0a6c 100644 --- a/samples/compose-samples/src/main/java/com/squareup/sample/compose/inlinerendering/InlineRenderingWorkflow.kt +++ b/samples/compose-samples/src/main/java/com/squareup/sample/compose/inlinerendering/InlineRenderingWorkflow.kt @@ -9,7 +9,7 @@ import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.animation.slideInVertically import androidx.compose.animation.slideOutVertically -import androidx.compose.animation.with +import androidx.compose.animation.togetherWith import androidx.compose.foundation.layout.Box import androidx.compose.material.Button import androidx.compose.material.Text @@ -77,7 +77,7 @@ private fun AnimatedCounter( AnimatedContent( targetState = counterValue, transitionSpec = { - (slideInVertically() + fadeIn() with slideOutVertically() + fadeOut()) + ((slideInVertically() + fadeIn()).togetherWith(slideOutVertically() + fadeOut())) .using(SizeTransform(clip = false)) } ) { content(it) } diff --git a/samples/compose-samples/src/main/java/com/squareup/sample/compose/launcher/SampleLauncherApp.kt b/samples/compose-samples/src/main/java/com/squareup/sample/compose/launcher/SampleLauncherApp.kt index b248fb6d4..71a9dae66 100644 --- a/samples/compose-samples/src/main/java/com/squareup/sample/compose/launcher/SampleLauncherApp.kt +++ b/samples/compose-samples/src/main/java/com/squareup/sample/compose/launcher/SampleLauncherApp.kt @@ -4,7 +4,7 @@ import android.content.Intent import android.os.Bundle import android.view.View import androidx.compose.foundation.clickable -import androidx.compose.foundation.gestures.forEachGesture +import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.height @@ -148,9 +148,9 @@ private fun launchSample( startActivity(context, intent, options) } -private fun Modifier.disableTouchInput(): Modifier = pointerInput(Unit) { - forEachGesture { - awaitPointerEventScope { +private fun Modifier.disableTouchInput(): Modifier = + pointerInput(Unit) { + awaitEachGesture { awaitPointerEvent(Initial).let { event -> event.changes.forEach { change -> if (change.pressed != change.previousPressed) change.consume() @@ -158,4 +158,3 @@ private fun Modifier.disableTouchInput(): Modifier = pointerInput(Unit) { } } } -} diff --git a/trace-encoder/dependencies/runtimeClasspath.txt b/trace-encoder/dependencies/runtimeClasspath.txt index 1562a659c..44200e3e2 100644 --- a/trace-encoder/dependencies/runtimeClasspath.txt +++ b/trace-encoder/dependencies/runtimeClasspath.txt @@ -2,11 +2,11 @@ com.squareup.moshi:moshi-adapters:1.15.0 com.squareup.moshi:moshi:1.15.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 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 diff --git a/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt b/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt index d8cb7353d..3d72a2ba1 100644 --- a/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt @@ -1,10 +1,10 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 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 diff --git a/workflow-config/config-jvm/dependencies/runtimeClasspath.txt b/workflow-config/config-jvm/dependencies/runtimeClasspath.txt index d8cb7353d..3d72a2ba1 100644 --- a/workflow-config/config-jvm/dependencies/runtimeClasspath.txt +++ b/workflow-config/config-jvm/dependencies/runtimeClasspath.txt @@ -1,10 +1,10 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 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 diff --git a/workflow-core/build.gradle.kts b/workflow-core/build.gradle.kts index e03ba149f..d0cbed541 100644 --- a/workflow-core/build.gradle.kts +++ b/workflow-core/build.gradle.kts @@ -8,7 +8,7 @@ plugins { kotlin { val targets = project.findProperty("workflow.targets") ?: "kmp" if (targets == "kmp" || targets == "ios") { - iosWithSimulatorArm64(project) + iosWithSimulatorArm64() } if (targets == "kmp" || targets == "jvm") { jvm { withJava() } diff --git a/workflow-core/dependencies/jsRuntimeClasspath.txt b/workflow-core/dependencies/jsRuntimeClasspath.txt index 6dd90ac24..a5e6dd8ce 100644 --- a/workflow-core/dependencies/jsRuntimeClasspath.txt +++ b/workflow-core/dependencies/jsRuntimeClasspath.txt @@ -1,11 +1,10 @@ com.squareup.okio:okio-js:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -org.jetbrains.kotlin:kotlin-dom-api-compat:1.9.10 -org.jetbrains.kotlin:kotlin-stdlib-js:1.9.10 -org.jetbrains.kotlin:kotlin-stdlib:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-dom-api-compat:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-js:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib:1.9.24 org.jetbrains.kotlin:kotlinx-atomicfu-runtime:1.8.20 org.jetbrains.kotlinx:atomicfu-js:0.21.0 org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -org.jetbrains:annotations:13.0 diff --git a/workflow-core/dependencies/jvmRuntimeClasspath.txt b/workflow-core/dependencies/jvmRuntimeClasspath.txt index 3ced6a669..9bb8a4666 100644 --- a/workflow-core/dependencies/jvmRuntimeClasspath.txt +++ b/workflow-core/dependencies/jvmRuntimeClasspath.txt @@ -1,9 +1,9 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom: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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +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.24 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 diff --git a/workflow-core/dependencies/runtimeClasspath.txt b/workflow-core/dependencies/runtimeClasspath.txt index d8cb7353d..3d72a2ba1 100644 --- a/workflow-core/dependencies/runtimeClasspath.txt +++ b/workflow-core/dependencies/runtimeClasspath.txt @@ -1,10 +1,10 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 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 diff --git a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/WorkflowAction.kt b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/WorkflowAction.kt index c93cba465..6ecf1b38b 100644 --- a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/WorkflowAction.kt +++ b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/WorkflowAction.kt @@ -35,7 +35,7 @@ public abstract class WorkflowAction { * The name to use for debugging. This is handy for logging and is used by the default * [toString] implementation provided here. */ - public open val debuggingName: String = CommonKClassTypeNamer.uniqueName(this::class) + public open val debuggingName: String = commonUniqueClassName(this::class) /** * The context for calls to [WorkflowAction.apply]. Allows the action to read and change the diff --git a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/WorkflowIdentifierType.kt b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/WorkflowIdentifierType.kt index e99c8c591..ae851d6a9 100644 --- a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/WorkflowIdentifierType.kt +++ b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/WorkflowIdentifierType.kt @@ -24,7 +24,7 @@ public sealed class WorkflowIdentifierType { val kClass: KClass<*>? = null, ) : WorkflowIdentifierType() { public constructor(kClass: KClass<*>) : this( - CommonKClassTypeNamer.uniqueName(kClass), + commonUniqueClassName(kClass), kClass ) } @@ -46,6 +46,4 @@ public sealed class WorkflowIdentifierType { } } -internal expect object CommonKClassTypeNamer { - public fun uniqueName(kClass: KClass<*>): String -} +internal expect fun commonUniqueClassName(kClass: KClass<*>): String diff --git a/workflow-core/src/commonTest/kotlin/com/squareup/workflow1/WorkflowIdentifierTest.kt b/workflow-core/src/commonTest/kotlin/com/squareup/workflow1/WorkflowIdentifierTest.kt index 4e822ee63..8ae6aa9a9 100644 --- a/workflow-core/src/commonTest/kotlin/com/squareup/workflow1/WorkflowIdentifierTest.kt +++ b/workflow-core/src/commonTest/kotlin/com/squareup/workflow1/WorkflowIdentifierTest.kt @@ -186,7 +186,7 @@ internal class WorkflowIdentifierTest { ) : Workflow, ImpostorWorkflow { override val realIdentifier: WorkflowIdentifier = proxied.identifier override fun describeRealIdentifier(): String = - "TestImpostor1(${CommonKClassTypeNamer.uniqueName(proxied::class)})" + "TestImpostor1(${commonUniqueClassName(proxied::class)})" override fun asStatefulWorkflow(): StatefulWorkflow = throw NotImplementedError() } diff --git a/workflow-core/src/iosMain/kotlin/com.squareup.workflow1/CommonKClassTypeNamer.kt b/workflow-core/src/iosMain/kotlin/com.squareup.workflow1/CommonKClassTypeNamer.kt deleted file mode 100644 index 7327e59f5..000000000 --- a/workflow-core/src/iosMain/kotlin/com.squareup.workflow1/CommonKClassTypeNamer.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.squareup.workflow1 - -import kotlin.reflect.KClass - -internal actual object CommonKClassTypeNamer { - public actual fun uniqueName(kClass: KClass<*>): String { - return kClass.qualifiedName ?: kClass.toString() - } -} diff --git a/workflow-core/src/iosMain/kotlin/com.squareup.workflow1/CommonUniqueClassName.kt b/workflow-core/src/iosMain/kotlin/com.squareup.workflow1/CommonUniqueClassName.kt new file mode 100644 index 000000000..96e01ede7 --- /dev/null +++ b/workflow-core/src/iosMain/kotlin/com.squareup.workflow1/CommonUniqueClassName.kt @@ -0,0 +1,7 @@ +package com.squareup.workflow1 + +import kotlin.reflect.KClass + +internal actual fun commonUniqueClassName(kClass: KClass<*>): String { + return kClass.qualifiedName ?: kClass.toString() +} diff --git a/workflow-core/src/jsMain/kotlin/com.squareup.workflow1/CommonKClassTypeNamer.kt b/workflow-core/src/jsMain/kotlin/com.squareup.workflow1/CommonUniqueClassName.kt similarity index 81% rename from workflow-core/src/jsMain/kotlin/com.squareup.workflow1/CommonKClassTypeNamer.kt rename to workflow-core/src/jsMain/kotlin/com.squareup.workflow1/CommonUniqueClassName.kt index 91e226194..ddafc7815 100644 --- a/workflow-core/src/jsMain/kotlin/com.squareup.workflow1/CommonKClassTypeNamer.kt +++ b/workflow-core/src/jsMain/kotlin/com.squareup.workflow1/CommonUniqueClassName.kt @@ -2,7 +2,11 @@ package com.squareup.workflow1 import kotlin.reflect.KClass -internal actual object CommonKClassTypeNamer { +internal actual fun commonUniqueClassName(kClass: KClass<*>): String { + return CommonKClassTypeNamer.actionUniqueClassName(kClass) +} + +internal object CommonKClassTypeNamer { // Stores mappings between KClass instances and their assigned names. val mappings = mutableMapOf, String>() @@ -13,7 +17,7 @@ internal actual object CommonKClassTypeNamer { // Recommended workarounds: // - Always provide a key for generic workflows // - Create non-generic subclasses of generic workflows - public actual fun uniqueName(kClass: KClass<*>): String { + internal fun actionUniqueClassName(kClass: KClass<*>): String { // Note: `kClass.qualifiedName` cannot be used here like other platforms as it's not supported // for JS. Therefore, we construct a unique name of each static KClass based on its simple name // and an index of when it was encountered. diff --git a/workflow-core/src/jvmMain/kotlin/com/squareup/workflow1/CommonKClassTypeNamer.kt b/workflow-core/src/jvmMain/kotlin/com/squareup/workflow1/CommonKClassTypeNamer.kt deleted file mode 100644 index 7327e59f5..000000000 --- a/workflow-core/src/jvmMain/kotlin/com/squareup/workflow1/CommonKClassTypeNamer.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.squareup.workflow1 - -import kotlin.reflect.KClass - -internal actual object CommonKClassTypeNamer { - public actual fun uniqueName(kClass: KClass<*>): String { - return kClass.qualifiedName ?: kClass.toString() - } -} diff --git a/workflow-core/src/jvmMain/kotlin/com/squareup/workflow1/CommonUniqueClassName.kt b/workflow-core/src/jvmMain/kotlin/com/squareup/workflow1/CommonUniqueClassName.kt new file mode 100644 index 000000000..96e01ede7 --- /dev/null +++ b/workflow-core/src/jvmMain/kotlin/com/squareup/workflow1/CommonUniqueClassName.kt @@ -0,0 +1,7 @@ +package com.squareup.workflow1 + +import kotlin.reflect.KClass + +internal actual fun commonUniqueClassName(kClass: KClass<*>): String { + return kClass.qualifiedName ?: kClass.toString() +} diff --git a/workflow-runtime/build.gradle.kts b/workflow-runtime/build.gradle.kts index 6d4ea4339..0cea60e6e 100644 --- a/workflow-runtime/build.gradle.kts +++ b/workflow-runtime/build.gradle.kts @@ -8,7 +8,7 @@ plugins { kotlin { val targets = project.findProperty("workflow.targets") ?: "kmp" if (targets == "kmp" || targets == "ios") { - iosWithSimulatorArm64(project) + iosWithSimulatorArm64() } if (targets == "kmp" || targets == "jvm") { jvm {} diff --git a/workflow-runtime/dependencies/jsRuntimeClasspath.txt b/workflow-runtime/dependencies/jsRuntimeClasspath.txt index 6dd90ac24..a5e6dd8ce 100644 --- a/workflow-runtime/dependencies/jsRuntimeClasspath.txt +++ b/workflow-runtime/dependencies/jsRuntimeClasspath.txt @@ -1,11 +1,10 @@ com.squareup.okio:okio-js:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -org.jetbrains.kotlin:kotlin-dom-api-compat:1.9.10 -org.jetbrains.kotlin:kotlin-stdlib-js:1.9.10 -org.jetbrains.kotlin:kotlin-stdlib:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-dom-api-compat:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-js:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib:1.9.24 org.jetbrains.kotlin:kotlinx-atomicfu-runtime:1.8.20 org.jetbrains.kotlinx:atomicfu-js:0.21.0 org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -org.jetbrains:annotations:13.0 diff --git a/workflow-runtime/dependencies/jvmRuntimeClasspath.txt b/workflow-runtime/dependencies/jvmRuntimeClasspath.txt index 3ced6a669..9bb8a4666 100644 --- a/workflow-runtime/dependencies/jvmRuntimeClasspath.txt +++ b/workflow-runtime/dependencies/jvmRuntimeClasspath.txt @@ -1,9 +1,9 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom: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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +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.24 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 diff --git a/workflow-rx2/dependencies/runtimeClasspath.txt b/workflow-rx2/dependencies/runtimeClasspath.txt index 1b8022059..00f28d4a7 100644 --- a/workflow-rx2/dependencies/runtimeClasspath.txt +++ b/workflow-rx2/dependencies/runtimeClasspath.txt @@ -1,11 +1,11 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 io.reactivex.rxjava2:rxjava:2.2.21 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 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 diff --git a/workflow-testing/dependencies/runtimeClasspath.txt b/workflow-testing/dependencies/runtimeClasspath.txt index 1de4577fd..85ebe34a6 100644 --- a/workflow-testing/dependencies/runtimeClasspath.txt +++ b/workflow-testing/dependencies/runtimeClasspath.txt @@ -2,12 +2,12 @@ app.cash.turbine:turbine-jvm:1.0.0 app.cash.turbine:turbine:1.0.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -org.jetbrains.kotlin:kotlin-reflect:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-reflect:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 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 diff --git a/workflow-tracing/dependencies/runtimeClasspath.txt b/workflow-tracing/dependencies/runtimeClasspath.txt index 1562a659c..44200e3e2 100644 --- a/workflow-tracing/dependencies/runtimeClasspath.txt +++ b/workflow-tracing/dependencies/runtimeClasspath.txt @@ -2,11 +2,11 @@ com.squareup.moshi:moshi-adapters:1.15.0 com.squareup.moshi:moshi:1.15.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 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 diff --git a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt index 6f7c4c2c0..ab87636c7 100644 --- a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt @@ -1,41 +1,64 @@ -androidx.activity:activity-compose:1.6.1 -androidx.activity:activity-ktx:1.6.1 -androidx.activity:activity:1.6.1 -androidx.annotation:annotation-experimental:1.3.0 -androidx.annotation:annotation-jvm:1.6.0 -androidx.annotation:annotation:1.6.0 +androidx.activity:activity-compose:1.7.0 +androidx.activity:activity-ktx:1.7.0 +androidx.activity:activity:1.7.0 +androidx.annotation:annotation-experimental:1.4.1 +androidx.annotation:annotation-jvm:1.8.1 +androidx.annotation:annotation:1.8.1 androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 -androidx.collection:collection:1.1.0 -androidx.compose.animation:animation-core:1.3.3 -androidx.compose.animation:animation:1.3.3 -androidx.compose.foundation:foundation-layout:1.3.1 -androidx.compose.foundation:foundation:1.3.1 -androidx.compose.runtime:runtime-saveable:1.3.3 -androidx.compose.runtime:runtime:1.3.3 -androidx.compose.ui:ui-geometry:1.3.3 -androidx.compose.ui:ui-graphics:1.3.3 -androidx.compose.ui:ui-text:1.3.3 -androidx.compose.ui:ui-tooling-preview:1.3.3 -androidx.compose.ui:ui-unit:1.3.3 -androidx.compose.ui:ui-util:1.3.3 -androidx.compose.ui:ui:1.3.3 -androidx.compose:compose-bom:2023.01.00 +androidx.collection:collection-jvm:1.4.4 +androidx.collection:collection-ktx:1.4.4 +androidx.collection:collection:1.4.4 +androidx.compose.animation:animation-android:1.7.2 +androidx.compose.animation:animation-core-android:1.7.2 +androidx.compose.animation:animation-core:1.7.2 +androidx.compose.animation:animation:1.7.2 +androidx.compose.foundation:foundation-android:1.7.2 +androidx.compose.foundation:foundation-layout-android:1.7.2 +androidx.compose.foundation:foundation-layout:1.7.2 +androidx.compose.foundation:foundation:1.7.2 +androidx.compose.runtime:runtime-android:1.7.2 +androidx.compose.runtime:runtime-saveable-android:1.7.2 +androidx.compose.runtime:runtime-saveable:1.7.2 +androidx.compose.runtime:runtime:1.7.2 +androidx.compose.ui:ui-android:1.7.2 +androidx.compose.ui:ui-geometry-android:1.7.2 +androidx.compose.ui:ui-geometry:1.7.2 +androidx.compose.ui:ui-graphics-android:1.7.2 +androidx.compose.ui:ui-graphics:1.7.2 +androidx.compose.ui:ui-text-android:1.7.2 +androidx.compose.ui:ui-text:1.7.2 +androidx.compose.ui:ui-tooling-preview-android:1.7.2 +androidx.compose.ui:ui-tooling-preview:1.7.2 +androidx.compose.ui:ui-unit-android:1.7.2 +androidx.compose.ui:ui-unit:1.7.2 +androidx.compose.ui:ui-util-android:1.7.2 +androidx.compose.ui:ui-util:1.7.2 +androidx.compose.ui:ui:1.7.2 +androidx.compose:compose-bom:2024.09.02 androidx.concurrent:concurrent-futures:1.1.0 -androidx.core:core-ktx:1.12.0 -androidx.core:core:1.12.0 +androidx.core:core-ktx:1.13.1 +androidx.core:core:1.13.1 androidx.customview:customview-poolingcontainer:1.0.0 +androidx.emoji2:emoji2:1.3.0 +androidx.graphics:graphics-path:1.0.1 androidx.interpolator:interpolator:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.6.1 -androidx.lifecycle:lifecycle-common:2.6.1 -androidx.lifecycle:lifecycle-livedata-core:2.6.1 -androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 -androidx.lifecycle:lifecycle-runtime:2.6.1 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 -androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 -androidx.lifecycle:lifecycle-viewmodel:2.6.1 -androidx.profileinstaller:profileinstaller:1.3.0 +androidx.lifecycle:lifecycle-common-jvm:2.8.7 +androidx.lifecycle:lifecycle-common:2.8.7 +androidx.lifecycle:lifecycle-livedata-core:2.8.7 +androidx.lifecycle:lifecycle-process:2.8.7 +androidx.lifecycle:lifecycle-runtime-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-compose:2.8.7 +androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-ktx:2.8.7 +androidx.lifecycle:lifecycle-runtime:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-android:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7 +androidx.lifecycle:lifecycle-viewmodel:2.8.7 +androidx.profileinstaller:profileinstaller:1.3.1 androidx.savedstate:savedstate-ktx:1.2.1 androidx.savedstate:savedstate:1.2.1 androidx.startup:startup-runtime:1.1.1 @@ -45,11 +68,11 @@ androidx.versionedparcelable:versionedparcelable:1.1.1 com.google.guava:listenablefuture:1.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 diff --git a/workflow-ui/compose-tooling/src/main/java/com/squareup/workflow1/ui/compose/tooling/PlaceholderViewFactory.kt b/workflow-ui/compose-tooling/src/main/java/com/squareup/workflow1/ui/compose/tooling/PlaceholderViewFactory.kt index 5f6faac1a..de833d5c3 100644 --- a/workflow-ui/compose-tooling/src/main/java/com/squareup/workflow1/ui/compose/tooling/PlaceholderViewFactory.kt +++ b/workflow-ui/compose-tooling/src/main/java/com/squareup/workflow1/ui/compose/tooling/PlaceholderViewFactory.kt @@ -3,7 +3,6 @@ package com.squareup.workflow1.ui.compose.tooling -import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.BasicText import androidx.compose.ui.Modifier @@ -35,31 +34,29 @@ internal fun placeholderScreenComposableFactory( modifier: Modifier ): ScreenComposableFactory = ScreenComposableFactory { rendering -> - BoxWithConstraints { - BasicText( - modifier = modifier - .clipToBounds() - .drawBehind { - drawIntoCanvas { canvas -> - canvas.withSaveLayer(size.toRect(), Paint().apply { alpha = .2f }) { - canvas.drawRect(size.toRect(), Paint().apply { color = Color.Gray }) - drawCrossHatch( - color = Color.Red, - strokeWidth = 2.dp, - spaceWidth = 8.dp, - ) - } + BasicText( + modifier = modifier + .clipToBounds() + .drawBehind { + drawIntoCanvas { canvas -> + canvas.withSaveLayer(size.toRect(), Paint().apply { alpha = .2f }) { + canvas.drawRect(size.toRect(), Paint().apply { color = Color.Gray }) + drawCrossHatch( + color = Color.Red, + strokeWidth = 2.dp, + spaceWidth = 8.dp, + ) } } - .padding(8.dp), - text = rendering.toString(), - style = TextStyle( - textAlign = TextAlign.Center, - color = Color.White, - shadow = Shadow(blurRadius = 5f, color = Color.Black) - ) + } + .padding(8.dp), + text = rendering.toString(), + style = TextStyle( + textAlign = TextAlign.Center, + color = Color.White, + shadow = Shadow(blurRadius = 5f, color = Color.Black) ) - } + ) } private fun DrawScope.drawCrossHatch( diff --git a/workflow-ui/compose/build.gradle.kts b/workflow-ui/compose/build.gradle.kts index ab5ef8990..4491c931e 100644 --- a/workflow-ui/compose/build.gradle.kts +++ b/workflow-ui/compose/build.gradle.kts @@ -51,6 +51,7 @@ dependencies { implementation(libs.androidx.compose.runtime.saveable) implementation(libs.androidx.compose.ui) implementation(libs.androidx.lifecycle.common) + implementation(libs.androidx.lifecycle.compose) implementation(libs.androidx.lifecycle.core) implementation(libs.kotlinx.coroutines.core) implementation(libs.squareup.okio) diff --git a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt index 20dbb06a8..ea073ca7b 100644 --- a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt @@ -1,38 +1,58 @@ -androidx.activity:activity-compose:1.6.1 -androidx.activity:activity-ktx:1.6.1 -androidx.activity:activity:1.6.1 -androidx.annotation:annotation-experimental:1.3.0 -androidx.annotation:annotation-jvm:1.6.0 -androidx.annotation:annotation:1.6.0 +androidx.activity:activity-compose:1.7.0 +androidx.activity:activity-ktx:1.7.0 +androidx.activity:activity:1.7.0 +androidx.annotation:annotation-experimental:1.4.1 +androidx.annotation:annotation-jvm:1.8.1 +androidx.annotation:annotation:1.8.1 androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.autofill:autofill:1.0.0 -androidx.collection:collection:1.1.0 -androidx.compose.animation:animation-core:1.3.3 -androidx.compose.foundation:foundation-layout:1.3.1 -androidx.compose.runtime:runtime-saveable:1.3.3 -androidx.compose.runtime:runtime:1.3.3 -androidx.compose.ui:ui-geometry:1.3.3 -androidx.compose.ui:ui-graphics:1.3.3 -androidx.compose.ui:ui-text:1.3.3 -androidx.compose.ui:ui-unit:1.3.3 -androidx.compose.ui:ui-util:1.3.3 -androidx.compose.ui:ui:1.3.3 -androidx.compose:compose-bom:2023.01.00 +androidx.collection:collection-jvm:1.4.4 +androidx.collection:collection-ktx:1.4.4 +androidx.collection:collection:1.4.4 +androidx.compose.animation:animation-core-android:1.7.2 +androidx.compose.animation:animation-core:1.7.2 +androidx.compose.foundation:foundation-layout-android:1.7.2 +androidx.compose.foundation:foundation-layout:1.7.2 +androidx.compose.runtime:runtime-android:1.7.2 +androidx.compose.runtime:runtime-saveable-android:1.7.2 +androidx.compose.runtime:runtime-saveable:1.7.2 +androidx.compose.runtime:runtime:1.7.2 +androidx.compose.ui:ui-android:1.7.2 +androidx.compose.ui:ui-geometry-android:1.7.2 +androidx.compose.ui:ui-geometry:1.7.2 +androidx.compose.ui:ui-graphics-android:1.7.2 +androidx.compose.ui:ui-graphics:1.7.2 +androidx.compose.ui:ui-text-android:1.7.2 +androidx.compose.ui:ui-text:1.7.2 +androidx.compose.ui:ui-unit-android:1.7.2 +androidx.compose.ui:ui-unit:1.7.2 +androidx.compose.ui:ui-util-android:1.7.2 +androidx.compose.ui:ui-util:1.7.2 +androidx.compose.ui:ui:1.7.2 +androidx.compose:compose-bom:2024.09.02 androidx.concurrent:concurrent-futures:1.1.0 androidx.core:core-ktx:1.12.0 androidx.core:core:1.12.0 androidx.customview:customview-poolingcontainer:1.0.0 +androidx.emoji2:emoji2:1.2.0 +androidx.graphics:graphics-path:1.0.1 androidx.interpolator:interpolator:1.0.0 -androidx.lifecycle:lifecycle-common-java8:2.6.1 -androidx.lifecycle:lifecycle-common:2.6.1 -androidx.lifecycle:lifecycle-livedata-core:2.6.1 -androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 -androidx.lifecycle:lifecycle-runtime:2.6.1 -androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 -androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 -androidx.lifecycle:lifecycle-viewmodel:2.6.1 -androidx.profileinstaller:profileinstaller:1.3.0 +androidx.lifecycle:lifecycle-common-jvm:2.8.7 +androidx.lifecycle:lifecycle-common:2.8.7 +androidx.lifecycle:lifecycle-livedata-core:2.8.7 +androidx.lifecycle:lifecycle-process:2.8.7 +androidx.lifecycle:lifecycle-runtime-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-compose:2.8.7 +androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-ktx:2.8.7 +androidx.lifecycle:lifecycle-runtime:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-android:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7 +androidx.lifecycle:lifecycle-viewmodel:2.8.7 +androidx.profileinstaller:profileinstaller:1.3.1 androidx.savedstate:savedstate-ktx:1.2.1 androidx.savedstate:savedstate:1.2.1 androidx.startup:startup-runtime:1.1.1 @@ -42,11 +62,11 @@ androidx.versionedparcelable:versionedparcelable:1.1.1 com.google.guava:listenablefuture:1.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 diff --git a/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwnerTest.kt b/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwnerTest.kt index 033abddc2..6561d0724 100644 --- a/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwnerTest.kt +++ b/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwnerTest.kt @@ -6,13 +6,13 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.test.junit4.createComposeRule import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle.State.CREATED import androidx.lifecycle.Lifecycle.State.RESUMED import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry +import androidx.lifecycle.compose.LocalLifecycleOwner import com.google.common.truth.Truth.assertThat import org.junit.Rule import org.junit.Test @@ -56,7 +56,9 @@ class ComposeLifecycleOwnerTest { composeTestRule.setContent { childLifecycleOwner = rememberChildLifecycleOwner(parentLifecycle) parentLifecycle.currentState = CREATED - CompositionLocalProvider(LocalLifecycleOwner provides childLifecycleOwner) { + CompositionLocalProvider( + androidx.lifecycle.compose.LocalLifecycleOwner provides childLifecycleOwner + ) { // let's assert right away as things are composing, because we want to ensure that // the lifecycle is in the correct state as soon as possible & not just after composition // has finished @@ -89,9 +91,9 @@ class ComposeLifecycleOwnerTest { LaunchedEffect(Unit) { seenRecomposition = true } CompositionLocalProvider( if (seenRecomposition) { - LocalLifecycleOwner provides customParentLifecycleOwner + androidx.lifecycle.compose.LocalLifecycleOwner provides customParentLifecycleOwner } else { - LocalLifecycleOwner provides LocalLifecycleOwner.current + androidx.lifecycle.compose.LocalLifecycleOwner provides androidx.lifecycle.compose.LocalLifecycleOwner.current } ) { diff --git a/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/WorkflowRenderingTest.kt b/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/WorkflowRenderingTest.kt index 93ae826e3..66fa67619 100644 --- a/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/WorkflowRenderingTest.kt +++ b/workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/WorkflowRenderingTest.kt @@ -20,7 +20,6 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.LocalView import androidx.compose.ui.platform.testTag import androidx.compose.ui.test.assertHeightIsEqualTo @@ -214,7 +213,7 @@ internal class WorkflowRenderingTest { class LifecycleRecorder : ComposableRendering { @Composable override fun Content() { - val lifecycle = LocalLifecycleOwner.current.lifecycle + val lifecycle = androidx.lifecycle.compose.LocalLifecycleOwner.current.lifecycle DisposableEffect(lifecycle) { lifecycle.addObserver( LifecycleEventObserver { _, event -> @@ -301,7 +300,9 @@ internal class WorkflowRenderingTest { } composeRule.setContent { - CompositionLocalProvider(LocalLifecycleOwner provides parentOwner) { + CompositionLocalProvider( + androidx.lifecycle.compose.LocalLifecycleOwner provides parentOwner + ) { env.RootScreen(LifecycleRecorder(states)) } } @@ -349,7 +350,9 @@ internal class WorkflowRenderingTest { } composeRule.setContent { - CompositionLocalProvider(LocalLifecycleOwner provides parentOwner) { + CompositionLocalProvider( + androidx.lifecycle.compose.LocalLifecycleOwner provides parentOwner + ) { env.RootScreen(LifecycleRecorder(states)) } } @@ -539,7 +542,7 @@ internal class WorkflowRenderingTest { private val states: MutableList ) : ComposableRendering { @Composable override fun Content() { - val lifecycle = LocalLifecycleOwner.current.lifecycle + val lifecycle = androidx.lifecycle.compose.LocalLifecycleOwner.current.lifecycle DisposableEffect(lifecycle) { this@LifecycleRecorder.states += lifecycle.currentState lifecycle.addObserver( diff --git a/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwner.kt b/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwner.kt index 3d9b7d9a9..9a5aca00d 100644 --- a/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwner.kt +++ b/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/ComposeLifecycleOwner.kt @@ -3,12 +3,12 @@ package com.squareup.workflow1.ui.compose import androidx.compose.runtime.Composable import androidx.compose.runtime.RememberObserver import androidx.compose.runtime.remember -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle.Event import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleRegistry +import androidx.lifecycle.compose.LocalLifecycleOwner /** * Returns a [LifecycleOwner] that is a mirror of the current [LocalLifecycleOwner] until this diff --git a/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/ScreenComposableFactory.kt b/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/ScreenComposableFactory.kt index 03c14f787..2a8668f35 100644 --- a/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/ScreenComposableFactory.kt +++ b/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/ScreenComposableFactory.kt @@ -9,9 +9,9 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.remember import androidx.compose.ui.platform.ComposeView -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.LocalSavedStateRegistryOwner import androidx.compose.ui.viewinterop.AndroidView +import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.setViewTreeLifecycleOwner import androidx.savedstate.setViewTreeSavedStateRegistryOwner import com.squareup.workflow1.ui.Screen diff --git a/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/WorkflowRendering.kt b/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/WorkflowRendering.kt index cfdf1d550..65f606807 100644 --- a/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/WorkflowRendering.kt +++ b/workflow-ui/compose/src/main/java/com/squareup/workflow1/ui/compose/WorkflowRendering.kt @@ -6,7 +6,7 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.key import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.lifecycle.compose.LocalLifecycleOwner import com.squareup.workflow1.ui.Compatible import com.squareup.workflow1.ui.Screen import com.squareup.workflow1.ui.ScreenViewHolder diff --git a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt index 21c26739e..b97fa8101 100644 --- a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt @@ -1,7 +1,7 @@ androidx.activity:activity:1.6.1 androidx.annotation:annotation-experimental:1.3.0 -androidx.annotation:annotation-jvm:1.6.0 -androidx.annotation:annotation:1.6.0 +androidx.annotation:annotation-jvm:1.8.1 +androidx.annotation:annotation:1.8.1 androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.collection:collection:1.1.0 @@ -9,13 +9,17 @@ androidx.concurrent:concurrent-futures:1.1.0 androidx.core:core-ktx:1.12.0 androidx.core:core:1.12.0 androidx.interpolator:interpolator:1.0.0 -androidx.lifecycle:lifecycle-common:2.6.1 -androidx.lifecycle:lifecycle-livedata-core:2.6.1 -androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 -androidx.lifecycle:lifecycle-runtime:2.6.1 -androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 -androidx.lifecycle:lifecycle-viewmodel:2.6.1 -androidx.profileinstaller:profileinstaller:1.3.0 +androidx.lifecycle:lifecycle-common-jvm:2.8.7 +androidx.lifecycle:lifecycle-common:2.8.7 +androidx.lifecycle:lifecycle-livedata-core:2.8.7 +androidx.lifecycle:lifecycle-runtime-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-ktx:2.8.7 +androidx.lifecycle:lifecycle-runtime:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-android:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7 +androidx.lifecycle:lifecycle-viewmodel:2.8.7 +androidx.profileinstaller:profileinstaller:1.3.1 androidx.savedstate:savedstate:1.2.1 androidx.startup:startup-runtime:1.1.1 androidx.tracing:tracing:1.0.0 @@ -24,11 +28,11 @@ androidx.versionedparcelable:versionedparcelable:1.1.1 com.google.guava:listenablefuture:1.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 diff --git a/workflow-ui/core-common/dependencies/runtimeClasspath.txt b/workflow-ui/core-common/dependencies/runtimeClasspath.txt index d8cb7353d..3d72a2ba1 100644 --- a/workflow-ui/core-common/dependencies/runtimeClasspath.txt +++ b/workflow-ui/core-common/dependencies/runtimeClasspath.txt @@ -1,10 +1,10 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 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 diff --git a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt index 0c08955f8..07a27f05e 100644 --- a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt @@ -1,7 +1,7 @@ androidx.activity:activity:1.6.1 androidx.annotation:annotation-experimental:1.3.0 -androidx.annotation:annotation-jvm:1.6.0 -androidx.annotation:annotation:1.6.0 +androidx.annotation:annotation-jvm:1.8.1 +androidx.annotation:annotation:1.8.1 androidx.arch.core:core-common:2.2.0 androidx.arch.core:core-runtime:2.2.0 androidx.collection:collection:1.1.0 @@ -9,13 +9,17 @@ androidx.concurrent:concurrent-futures:1.1.0 androidx.core:core-ktx:1.12.0 androidx.core:core:1.12.0 androidx.interpolator:interpolator:1.0.0 -androidx.lifecycle:lifecycle-common:2.6.1 -androidx.lifecycle:lifecycle-livedata-core:2.6.1 -androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 -androidx.lifecycle:lifecycle-runtime:2.6.1 -androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 -androidx.lifecycle:lifecycle-viewmodel:2.6.1 -androidx.profileinstaller:profileinstaller:1.3.0 +androidx.lifecycle:lifecycle-common-jvm:2.8.7 +androidx.lifecycle:lifecycle-common:2.8.7 +androidx.lifecycle:lifecycle-livedata-core:2.8.7 +androidx.lifecycle:lifecycle-runtime-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7 +androidx.lifecycle:lifecycle-runtime-ktx:2.8.7 +androidx.lifecycle:lifecycle-runtime:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-android:2.8.7 +androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7 +androidx.lifecycle:lifecycle-viewmodel:2.8.7 +androidx.profileinstaller:profileinstaller:1.3.1 androidx.savedstate:savedstate:1.2.1 androidx.startup:startup-runtime:1.1.1 androidx.tracing:tracing:1.0.0 @@ -26,11 +30,11 @@ com.squareup.curtains:curtains:1.2.2 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 com.squareup.radiography:radiography:2.4.1 -org.jetbrains.kotlin:kotlin-bom:1.9.10 -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:1.9.10 +org.jetbrains.kotlin:kotlin-bom:1.9.24 +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 +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.24 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3