From 11349bd103075277274b76df2a91a3703d101836 Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Thu, 28 May 2026 16:47:36 -0700 Subject: [PATCH 01/14] 1.12.0-alpha01 --- backstack/build.gradle.kts | 2 +- .../dependencies/androidRuntimeClasspath.txt | 11 ---------- .../dependencies/jvmRuntimeClasspath.txt | 10 ++++++---- .../main/kotlin/circuit.android.gradle.kts | 5 +++-- circuit-codegen-annotations/build.gradle.kts | 2 +- circuit-foundation/build.gradle.kts | 2 +- .../dependencies/androidRuntimeClasspath.txt | 9 --------- .../dependencies/jvmRuntimeClasspath.txt | 2 -- circuit-overlay/build.gradle.kts | 2 +- .../dependencies/androidRuntimeClasspath.txt | 11 ---------- .../dependencies/jvmRuntimeClasspath.txt | 10 ++++++---- circuit-retained/build.gradle.kts | 2 +- circuit-runtime-navigation/build.gradle.kts | 2 +- circuit-runtime-presenter/build.gradle.kts | 2 +- circuit-runtime-screen/build.gradle.kts | 2 +- circuit-runtime-ui/build.gradle.kts | 2 +- .../dependencies/androidRuntimeClasspath.txt | 11 ---------- .../dependencies/jvmRuntimeClasspath.txt | 10 ++++++---- circuit-runtime/build.gradle.kts | 2 +- circuit-shared-elements/build.gradle.kts | 2 +- .../dependencies/androidRuntimeClasspath.txt | 11 ---------- .../dependencies/jvmRuntimeClasspath.txt | 10 ++++++---- circuit-test/build.gradle.kts | 2 +- .../dependencies/androidRuntimeClasspath.txt | 9 --------- .../dependencies/jvmRuntimeClasspath.txt | 2 -- circuitx/effects/build.gradle.kts | 2 +- .../dependencies/androidRuntimeClasspath.txt | 9 --------- circuitx/gesture-navigation/build.gradle.kts | 2 +- .../dependencies/androidRuntimeClasspath.txt | 9 --------- .../dependencies/jvmRuntimeClasspath.txt | 2 -- circuitx/navigation/build.gradle.kts | 2 +- .../dependencies/androidRuntimeClasspath.txt | 9 --------- .../dependencies/jvmRuntimeClasspath.txt | 2 -- circuitx/overlays/build.gradle.kts | 2 +- .../dependencies/androidRuntimeClasspath.txt | 9 --------- gradle/libs.versions.toml | 5 +++-- internal-runtime/build.gradle.kts | 2 +- internal-test-utils/build.gradle.kts | 2 +- kotlin-js-store/package-lock.json | 10 ++++++++-- kotlin-js-store/wasm/package-lock.json | 20 +++++++++++++++---- samples/bottom-navigation/build.gradle.kts | 2 +- samples/counter/apps/build.gradle.kts | 2 +- samples/counter/build.gradle.kts | 2 +- samples/star/build.gradle.kts | 2 +- samples/star/coil-rule/build.gradle.kts | 2 +- samples/tutorial/build.gradle.kts | 2 +- 46 files changed, 78 insertions(+), 156 deletions(-) diff --git a/backstack/build.gradle.kts b/backstack/build.gradle.kts index 0974130a24..21e3e65ca3 100644 --- a/backstack/build.gradle.kts +++ b/backstack/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.backstack" - compileSdk = 36 + compileSdk = 37 withHostTest { isReturnDefaultValues = true } } jvm() diff --git a/backstack/dependencies/androidRuntimeClasspath.txt b/backstack/dependencies/androidRuntimeClasspath.txt index ccdb6ba7c4..66b68e8be0 100644 --- a/backstack/dependencies/androidRuntimeClasspath.txt +++ b/backstack/dependencies/androidRuntimeClasspath.txt @@ -34,17 +34,12 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -57,9 +52,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager -androidx.print:print androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -68,7 +60,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core @@ -77,8 +68,6 @@ com.google.guava:listenablefuture org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate org.jetbrains.compose.runtime:runtime-saveable diff --git a/backstack/dependencies/jvmRuntimeClasspath.txt b/backstack/dependencies/jvmRuntimeClasspath.txt index 9f536ed469..4c0a921a21 100644 --- a/backstack/dependencies/jvmRuntimeClasspath.txt +++ b/backstack/dependencies/jvmRuntimeClasspath.txt @@ -17,10 +17,14 @@ androidx.lifecycle:lifecycle-runtime-compose-desktop androidx.lifecycle:lifecycle-runtime-compose androidx.lifecycle:lifecycle-runtime-desktop androidx.lifecycle:lifecycle-runtime +androidx.lifecycle:lifecycle-viewmodel-compose-desktop +androidx.lifecycle:lifecycle-viewmodel-compose androidx.lifecycle:lifecycle-viewmodel-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-compose-desktop +androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent-desktop androidx.navigationevent:navigationevent androidx.savedstate:savedstate-compose-desktop @@ -31,8 +35,8 @@ org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel +org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop +org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose-desktop org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate @@ -40,8 +44,6 @@ org.jetbrains.compose.runtime:runtime-desktop org.jetbrains.compose.runtime:runtime-saveable-desktop org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime -org.jetbrains.compose.ui:ui-backhandler-desktop -org.jetbrains.compose.ui:ui-backhandler org.jetbrains.compose.ui:ui-desktop org.jetbrains.compose.ui:ui-geometry-desktop org.jetbrains.compose.ui:ui-geometry diff --git a/build-logic/src/main/kotlin/circuit.android.gradle.kts b/build-logic/src/main/kotlin/circuit.android.gradle.kts index 9ff745e4e1..536c169d15 100644 --- a/build-logic/src/main/kotlin/circuit.android.gradle.kts +++ b/build-logic/src/main/kotlin/circuit.android.gradle.kts @@ -12,6 +12,7 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtension val catalog = rootProject.extensions.getByType().named("libs") val jvmTargetVersion = catalog.findVersion("jvmTarget").get().requiredVersion val compileSdkVersion = catalog.findVersion("android-compileSdk").get().requiredVersion.toInt() +val targetSdkVersion = catalog.findVersion("android-targetSdk").get().requiredVersion.toInt() val circuitExtension = extensions.getByType() // Android Library configuration @@ -24,7 +25,7 @@ pluginManager.withPlugin("com.android.kotlin.multiplatform.library") { compileSdk = compileSdkVersion minSdk = 23 compilations.withType(KotlinMultiplatformAndroidHostTestCompilation::class.java) { - targetSdk { release(compileSdkVersion) } + targetSdk { release(targetSdkVersion) } } lint { // https://issuetracker.google.com/issues/243267012 @@ -105,7 +106,7 @@ pluginManager.withPlugin("com.android.application") { defaultConfig { minSdk = 23 - targetSdk = compileSdkVersion + targetSdk = targetSdkVersion } buildTypes { diff --git a/circuit-codegen-annotations/build.gradle.kts b/circuit-codegen-annotations/build.gradle.kts index aecb288604..eac5fd33a3 100644 --- a/circuit-codegen-annotations/build.gradle.kts +++ b/circuit-codegen-annotations/build.gradle.kts @@ -15,7 +15,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.codegen.annotations" - compileSdk = 36 + compileSdk = 37 optimization.consumerKeepRules.apply { publish = true file( diff --git a/circuit-foundation/build.gradle.kts b/circuit-foundation/build.gradle.kts index 64695d1029..92159bf3e0 100644 --- a/circuit-foundation/build.gradle.kts +++ b/circuit-foundation/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.foundation" - compileSdk = 36 + compileSdk = 37 androidResources { enable = true } withHostTest { isIncludeAndroidResources = true } withDeviceTest { androidResources { enable = true } } diff --git a/circuit-foundation/dependencies/androidRuntimeClasspath.txt b/circuit-foundation/dependencies/androidRuntimeClasspath.txt index 2e04859438..9fe8348bac 100644 --- a/circuit-foundation/dependencies/androidRuntimeClasspath.txt +++ b/circuit-foundation/dependencies/androidRuntimeClasspath.txt @@ -43,17 +43,12 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -68,13 +63,10 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager androidx.navigationevent:navigationevent-android androidx.navigationevent:navigationevent-compose-android androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent -androidx.print:print androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -83,7 +75,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core diff --git a/circuit-foundation/dependencies/jvmRuntimeClasspath.txt b/circuit-foundation/dependencies/jvmRuntimeClasspath.txt index 5c43abab05..2a1aa1dc24 100644 --- a/circuit-foundation/dependencies/jvmRuntimeClasspath.txt +++ b/circuit-foundation/dependencies/jvmRuntimeClasspath.txt @@ -56,8 +56,6 @@ org.jetbrains.compose.runtime:runtime-desktop org.jetbrains.compose.runtime:runtime-saveable-desktop org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime -org.jetbrains.compose.ui:ui-backhandler-desktop -org.jetbrains.compose.ui:ui-backhandler org.jetbrains.compose.ui:ui-desktop org.jetbrains.compose.ui:ui-geometry-desktop org.jetbrains.compose.ui:ui-geometry diff --git a/circuit-overlay/build.gradle.kts b/circuit-overlay/build.gradle.kts index a23d22cea8..40116a9c7c 100644 --- a/circuit-overlay/build.gradle.kts +++ b/circuit-overlay/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.overlay" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/circuit-overlay/dependencies/androidRuntimeClasspath.txt b/circuit-overlay/dependencies/androidRuntimeClasspath.txt index 70686fe926..d823e234af 100644 --- a/circuit-overlay/dependencies/androidRuntimeClasspath.txt +++ b/circuit-overlay/dependencies/androidRuntimeClasspath.txt @@ -42,17 +42,12 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -65,9 +60,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager -androidx.print:print androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -76,7 +68,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core @@ -85,8 +76,6 @@ com.google.guava:listenablefuture org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate org.jetbrains.compose.animation:animation-core diff --git a/circuit-overlay/dependencies/jvmRuntimeClasspath.txt b/circuit-overlay/dependencies/jvmRuntimeClasspath.txt index 9165dd247e..5bba96688d 100644 --- a/circuit-overlay/dependencies/jvmRuntimeClasspath.txt +++ b/circuit-overlay/dependencies/jvmRuntimeClasspath.txt @@ -17,10 +17,14 @@ androidx.lifecycle:lifecycle-runtime-compose-desktop androidx.lifecycle:lifecycle-runtime-compose androidx.lifecycle:lifecycle-runtime-desktop androidx.lifecycle:lifecycle-runtime +androidx.lifecycle:lifecycle-viewmodel-compose-desktop +androidx.lifecycle:lifecycle-viewmodel-compose androidx.lifecycle:lifecycle-viewmodel-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-compose-desktop +androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent-desktop androidx.navigationevent:navigationevent androidx.savedstate:savedstate-compose-desktop @@ -31,8 +35,8 @@ org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel +org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop +org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose-desktop org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate @@ -48,8 +52,6 @@ org.jetbrains.compose.runtime:runtime-desktop org.jetbrains.compose.runtime:runtime-saveable-desktop org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime -org.jetbrains.compose.ui:ui-backhandler-desktop -org.jetbrains.compose.ui:ui-backhandler org.jetbrains.compose.ui:ui-desktop org.jetbrains.compose.ui:ui-geometry-desktop org.jetbrains.compose.ui:ui-geometry diff --git a/circuit-retained/build.gradle.kts b/circuit-retained/build.gradle.kts index 5ba8c7ef42..79ccc6e396 100644 --- a/circuit-retained/build.gradle.kts +++ b/circuit-retained/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.retained" - compileSdk = 36 + compileSdk = 37 androidResources { enable = true } withDeviceTest { androidResources { enable = true } } } diff --git a/circuit-runtime-navigation/build.gradle.kts b/circuit-runtime-navigation/build.gradle.kts index c2724928d7..4e550b155d 100644 --- a/circuit-runtime-navigation/build.gradle.kts +++ b/circuit-runtime-navigation/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.runtime.navigation" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/circuit-runtime-presenter/build.gradle.kts b/circuit-runtime-presenter/build.gradle.kts index 30d9cd0dd9..8bc00515b1 100644 --- a/circuit-runtime-presenter/build.gradle.kts +++ b/circuit-runtime-presenter/build.gradle.kts @@ -15,7 +15,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.runtime.presenter" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/circuit-runtime-screen/build.gradle.kts b/circuit-runtime-screen/build.gradle.kts index 04f534a166..51a536f29f 100644 --- a/circuit-runtime-screen/build.gradle.kts +++ b/circuit-runtime-screen/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.runtime.screen" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/circuit-runtime-ui/build.gradle.kts b/circuit-runtime-ui/build.gradle.kts index e7e09444d4..fbeb8b72f8 100644 --- a/circuit-runtime-ui/build.gradle.kts +++ b/circuit-runtime-ui/build.gradle.kts @@ -15,7 +15,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.runtime.ui" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt b/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt index ef3f052c17..905d50e58f 100644 --- a/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt +++ b/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt @@ -34,17 +34,12 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -57,9 +52,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager -androidx.print:print androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -68,7 +60,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core @@ -77,8 +68,6 @@ com.google.guava:listenablefuture org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate org.jetbrains.compose.runtime:runtime-saveable diff --git a/circuit-runtime-ui/dependencies/jvmRuntimeClasspath.txt b/circuit-runtime-ui/dependencies/jvmRuntimeClasspath.txt index 9f536ed469..4c0a921a21 100644 --- a/circuit-runtime-ui/dependencies/jvmRuntimeClasspath.txt +++ b/circuit-runtime-ui/dependencies/jvmRuntimeClasspath.txt @@ -17,10 +17,14 @@ androidx.lifecycle:lifecycle-runtime-compose-desktop androidx.lifecycle:lifecycle-runtime-compose androidx.lifecycle:lifecycle-runtime-desktop androidx.lifecycle:lifecycle-runtime +androidx.lifecycle:lifecycle-viewmodel-compose-desktop +androidx.lifecycle:lifecycle-viewmodel-compose androidx.lifecycle:lifecycle-viewmodel-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-compose-desktop +androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent-desktop androidx.navigationevent:navigationevent androidx.savedstate:savedstate-compose-desktop @@ -31,8 +35,8 @@ org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel +org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop +org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose-desktop org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate @@ -40,8 +44,6 @@ org.jetbrains.compose.runtime:runtime-desktop org.jetbrains.compose.runtime:runtime-saveable-desktop org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime -org.jetbrains.compose.ui:ui-backhandler-desktop -org.jetbrains.compose.ui:ui-backhandler org.jetbrains.compose.ui:ui-desktop org.jetbrains.compose.ui:ui-geometry-desktop org.jetbrains.compose.ui:ui-geometry diff --git a/circuit-runtime/build.gradle.kts b/circuit-runtime/build.gradle.kts index dc15b6b209..f67c67e40e 100644 --- a/circuit-runtime/build.gradle.kts +++ b/circuit-runtime/build.gradle.kts @@ -15,7 +15,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.runtime" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/circuit-shared-elements/build.gradle.kts b/circuit-shared-elements/build.gradle.kts index fd1563df78..e1e58c3863 100644 --- a/circuit-shared-elements/build.gradle.kts +++ b/circuit-shared-elements/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.sharedelements" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt b/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt index 70686fe926..d823e234af 100644 --- a/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt +++ b/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt @@ -42,17 +42,12 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -65,9 +60,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager -androidx.print:print androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -76,7 +68,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core @@ -85,8 +76,6 @@ com.google.guava:listenablefuture org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate org.jetbrains.compose.animation:animation-core diff --git a/circuit-shared-elements/dependencies/jvmRuntimeClasspath.txt b/circuit-shared-elements/dependencies/jvmRuntimeClasspath.txt index 9165dd247e..5bba96688d 100644 --- a/circuit-shared-elements/dependencies/jvmRuntimeClasspath.txt +++ b/circuit-shared-elements/dependencies/jvmRuntimeClasspath.txt @@ -17,10 +17,14 @@ androidx.lifecycle:lifecycle-runtime-compose-desktop androidx.lifecycle:lifecycle-runtime-compose androidx.lifecycle:lifecycle-runtime-desktop androidx.lifecycle:lifecycle-runtime +androidx.lifecycle:lifecycle-viewmodel-compose-desktop +androidx.lifecycle:lifecycle-viewmodel-compose androidx.lifecycle:lifecycle-viewmodel-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-compose-desktop +androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent-desktop androidx.navigationevent:navigationevent androidx.savedstate:savedstate-compose-desktop @@ -31,8 +35,8 @@ org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel +org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop +org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose-desktop org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate @@ -48,8 +52,6 @@ org.jetbrains.compose.runtime:runtime-desktop org.jetbrains.compose.runtime:runtime-saveable-desktop org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime -org.jetbrains.compose.ui:ui-backhandler-desktop -org.jetbrains.compose.ui:ui-backhandler org.jetbrains.compose.ui:ui-desktop org.jetbrains.compose.ui:ui-geometry-desktop org.jetbrains.compose.ui:ui-geometry diff --git a/circuit-test/build.gradle.kts b/circuit-test/build.gradle.kts index b4a7834aba..6bc687f5a3 100644 --- a/circuit-test/build.gradle.kts +++ b/circuit-test/build.gradle.kts @@ -17,7 +17,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.test" - compileSdk = 36 + compileSdk = 37 withHostTest {} } jvm() diff --git a/circuit-test/dependencies/androidRuntimeClasspath.txt b/circuit-test/dependencies/androidRuntimeClasspath.txt index 5e9144b2ac..cfdd3591de 100644 --- a/circuit-test/dependencies/androidRuntimeClasspath.txt +++ b/circuit-test/dependencies/androidRuntimeClasspath.txt @@ -43,17 +43,12 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -68,13 +63,10 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager androidx.navigationevent:navigationevent-android androidx.navigationevent:navigationevent-compose-android androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent -androidx.print:print androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -83,7 +75,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core diff --git a/circuit-test/dependencies/jvmRuntimeClasspath.txt b/circuit-test/dependencies/jvmRuntimeClasspath.txt index 3c4f1c09db..72e23c046d 100644 --- a/circuit-test/dependencies/jvmRuntimeClasspath.txt +++ b/circuit-test/dependencies/jvmRuntimeClasspath.txt @@ -60,8 +60,6 @@ org.jetbrains.compose.runtime:runtime-desktop org.jetbrains.compose.runtime:runtime-saveable-desktop org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime -org.jetbrains.compose.ui:ui-backhandler-desktop -org.jetbrains.compose.ui:ui-backhandler org.jetbrains.compose.ui:ui-desktop org.jetbrains.compose.ui:ui-geometry-desktop org.jetbrains.compose.ui:ui-geometry diff --git a/circuitx/effects/build.gradle.kts b/circuitx/effects/build.gradle.kts index 62833ff8e5..82845aded8 100644 --- a/circuitx/effects/build.gradle.kts +++ b/circuitx/effects/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuitx.sideeffects" - compileSdk = 36 + compileSdk = 37 withHostTest { isIncludeAndroidResources = true } } jvm() diff --git a/circuitx/effects/dependencies/androidRuntimeClasspath.txt b/circuitx/effects/dependencies/androidRuntimeClasspath.txt index f064b6a5f9..6340b256d3 100644 --- a/circuitx/effects/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/effects/dependencies/androidRuntimeClasspath.txt @@ -34,17 +34,12 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -59,9 +54,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager -androidx.print:print androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -70,7 +62,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core diff --git a/circuitx/gesture-navigation/build.gradle.kts b/circuitx/gesture-navigation/build.gradle.kts index 109ff23329..00dab59752 100644 --- a/circuitx/gesture-navigation/build.gradle.kts +++ b/circuitx/gesture-navigation/build.gradle.kts @@ -15,7 +15,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuitx.gesturenavigation" - compileSdk = 36 + compileSdk = 37 withHostTest { isIncludeAndroidResources = true } } jvm { testRuns["test"].executionTask.configure { enabled = false } } diff --git a/circuitx/gesture-navigation/dependencies/androidRuntimeClasspath.txt b/circuitx/gesture-navigation/dependencies/androidRuntimeClasspath.txt index 37d9ec1466..c1b77a1d6a 100644 --- a/circuitx/gesture-navigation/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/gesture-navigation/dependencies/androidRuntimeClasspath.txt @@ -47,18 +47,13 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-java8 androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -73,13 +68,10 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager androidx.navigationevent:navigationevent-android androidx.navigationevent:navigationevent-compose-android androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent -androidx.print:print androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -88,7 +80,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core diff --git a/circuitx/gesture-navigation/dependencies/jvmRuntimeClasspath.txt b/circuitx/gesture-navigation/dependencies/jvmRuntimeClasspath.txt index 5c43abab05..2a1aa1dc24 100644 --- a/circuitx/gesture-navigation/dependencies/jvmRuntimeClasspath.txt +++ b/circuitx/gesture-navigation/dependencies/jvmRuntimeClasspath.txt @@ -56,8 +56,6 @@ org.jetbrains.compose.runtime:runtime-desktop org.jetbrains.compose.runtime:runtime-saveable-desktop org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime -org.jetbrains.compose.ui:ui-backhandler-desktop -org.jetbrains.compose.ui:ui-backhandler org.jetbrains.compose.ui:ui-desktop org.jetbrains.compose.ui:ui-geometry-desktop org.jetbrains.compose.ui:ui-geometry diff --git a/circuitx/navigation/build.gradle.kts b/circuitx/navigation/build.gradle.kts index 26a56ab744..5d3d2ca89d 100644 --- a/circuitx/navigation/build.gradle.kts +++ b/circuitx/navigation/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuitx.navigation" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/circuitx/navigation/dependencies/androidRuntimeClasspath.txt b/circuitx/navigation/dependencies/androidRuntimeClasspath.txt index 2e04859438..9fe8348bac 100644 --- a/circuitx/navigation/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/navigation/dependencies/androidRuntimeClasspath.txt @@ -43,17 +43,12 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -68,13 +63,10 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager androidx.navigationevent:navigationevent-android androidx.navigationevent:navigationevent-compose-android androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent -androidx.print:print androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -83,7 +75,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core diff --git a/circuitx/navigation/dependencies/jvmRuntimeClasspath.txt b/circuitx/navigation/dependencies/jvmRuntimeClasspath.txt index 5c43abab05..2a1aa1dc24 100644 --- a/circuitx/navigation/dependencies/jvmRuntimeClasspath.txt +++ b/circuitx/navigation/dependencies/jvmRuntimeClasspath.txt @@ -56,8 +56,6 @@ org.jetbrains.compose.runtime:runtime-desktop org.jetbrains.compose.runtime:runtime-saveable-desktop org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime -org.jetbrains.compose.ui:ui-backhandler-desktop -org.jetbrains.compose.ui:ui-backhandler org.jetbrains.compose.ui:ui-desktop org.jetbrains.compose.ui:ui-geometry-desktop org.jetbrains.compose.ui:ui-geometry diff --git a/circuitx/overlays/build.gradle.kts b/circuitx/overlays/build.gradle.kts index 452f636f3b..a66c7cbb60 100644 --- a/circuitx/overlays/build.gradle.kts +++ b/circuitx/overlays/build.gradle.kts @@ -15,7 +15,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuitx.overlays" - compileSdk = 36 + compileSdk = 37 withHostTest {} } jvm() diff --git a/circuitx/overlays/dependencies/androidRuntimeClasspath.txt b/circuitx/overlays/dependencies/androidRuntimeClasspath.txt index 37d9ec1466..c1b77a1d6a 100644 --- a/circuitx/overlays/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/overlays/dependencies/androidRuntimeClasspath.txt @@ -47,18 +47,13 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-java8 androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -73,13 +68,10 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager androidx.navigationevent:navigationevent-android androidx.navigationevent:navigationevent-compose-android androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent -androidx.print:print androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -88,7 +80,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 995fe339b7..05881106ff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] agp = "9.2.1" -android-compileSdk = "36" +android-compileSdk = "37" +android-targetSdk = "36" androidx-activity = "1.13.0" androidx-annotation = "1.10.0" androidx-appcompat = "1.7.1" @@ -15,7 +16,7 @@ dagger = "2.59.2" datastore = "1.2.1" dokka = "2.2.0" eithernet = "2.0.0" -jb-compose = "1.11.0" +jb-compose = "1.12.0-alpha01" jb-compose-material-icons-core = "1.7.3" jb-compose-material3 = "1.9.0" jb-compose-navigationevent = "1.1.0" diff --git a/internal-runtime/build.gradle.kts b/internal-runtime/build.gradle.kts index be13a70bd8..e6a2b391c2 100644 --- a/internal-runtime/build.gradle.kts +++ b/internal-runtime/build.gradle.kts @@ -15,7 +15,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.internal.runtime" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/internal-test-utils/build.gradle.kts b/internal-test-utils/build.gradle.kts index 90c8943349..224dbe52f2 100644 --- a/internal-test-utils/build.gradle.kts +++ b/internal-test-utils/build.gradle.kts @@ -16,7 +16,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.internal.test" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/kotlin-js-store/package-lock.json b/kotlin-js-store/package-lock.json index df2c5710de..bcc6320632 100644 --- a/kotlin-js-store/package-lock.json +++ b/kotlin-js-store/package-lock.json @@ -46,7 +46,7 @@ "packages/circuitx-overlays-test", "packages/counterbrowser", "packages/counterbrowser-test", - "packages_imported/skiko-js/0.144.6", + "packages_imported/skiko-js/0.148.1", "packages_imported/Kotlin-DateTime-library-kotlinx-datetime/0.7.1" ], "devDependencies": {} @@ -3271,7 +3271,7 @@ } }, "node_modules/skiko-js": { - "resolved": "packages_imported/skiko-js/0.144.6", + "resolved": "packages_imported/skiko-js/0.148.1", "link": true }, "node_modules/socket.io": { @@ -4132,6 +4132,12 @@ "packages_imported/skiko-js/0.144.6": { "name": "skiko-js", "version": "0.144.6", + "extraneous": true, + "devDependencies": {} + }, + "packages_imported/skiko-js/0.148.1": { + "name": "skiko-js", + "version": "0.148.1", "devDependencies": {} }, "packages_imported/skiko-js/0.9.22-2": { diff --git a/kotlin-js-store/wasm/package-lock.json b/kotlin-js-store/wasm/package-lock.json index d829ec584e..73645a4465 100644 --- a/kotlin-js-store/wasm/package-lock.json +++ b/kotlin-js-store/wasm/package-lock.json @@ -48,8 +48,8 @@ "packages/counterbrowser-test", "packages/counterApp", "packages/counterApp-test", - "packages_imported/skiko-wasm-js/0.144.6", - "packages_imported/skiko-js-wasm-runtime/0.144.6", + "packages_imported/skiko-wasm-js/0.148.1", + "packages_imported/skiko-js-wasm-runtime/0.148.1", "packages_imported/Kotlin-DateTime-library-kotlinx-datetime-wasm-js/0.7.1" ], "devDependencies": {} @@ -224,11 +224,11 @@ "link": true }, "node_modules/skiko-js-wasm-runtime": { - "resolved": "packages_imported/skiko-js-wasm-runtime/0.144.6", + "resolved": "packages_imported/skiko-js-wasm-runtime/0.148.1", "link": true }, "node_modules/skiko-wasm-js": { - "resolved": "packages_imported/skiko-wasm-js/0.144.6", + "resolved": "packages_imported/skiko-wasm-js/0.148.1", "link": true }, "packages_imported/Kotlin-DateTime-library-kotlinx-datetime-wasm-js/0.6.0": { @@ -264,6 +264,12 @@ "packages_imported/skiko-js-wasm-runtime/0.144.6": { "name": "skiko-js-wasm-runtime", "version": "0.144.6", + "extraneous": true, + "devDependencies": {} + }, + "packages_imported/skiko-js-wasm-runtime/0.148.1": { + "name": "skiko-js-wasm-runtime", + "version": "0.148.1", "devDependencies": {} }, "packages_imported/skiko-js-wasm-runtime/0.9.22": { @@ -329,6 +335,12 @@ "packages_imported/skiko-wasm-js/0.144.6": { "name": "skiko-wasm-js", "version": "0.144.6", + "extraneous": true, + "devDependencies": {} + }, + "packages_imported/skiko-wasm-js/0.148.1": { + "name": "skiko-wasm-js", + "version": "0.148.1", "devDependencies": {} }, "packages_imported/skiko-wasm-js/0.9.22": { diff --git a/samples/bottom-navigation/build.gradle.kts b/samples/bottom-navigation/build.gradle.kts index 62940830c3..af7ad683db 100644 --- a/samples/bottom-navigation/build.gradle.kts +++ b/samples/bottom-navigation/build.gradle.kts @@ -14,7 +14,7 @@ plugins { kotlin { android { namespace = "com.slack.circuit.sample.navigation" - compileSdk = 36 + compileSdk = 37 withHostTest { isIncludeAndroidResources = true } } jvm { diff --git a/samples/counter/apps/build.gradle.kts b/samples/counter/apps/build.gradle.kts index 766c403bc8..7922b3b94a 100644 --- a/samples/counter/apps/build.gradle.kts +++ b/samples/counter/apps/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.sample.counter.android" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/samples/counter/build.gradle.kts b/samples/counter/build.gradle.kts index f5ef736542..750a7fd8ad 100644 --- a/samples/counter/build.gradle.kts +++ b/samples/counter/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.sample.counter" - compileSdk = 36 + compileSdk = 37 } jvm() js(IR) { diff --git a/samples/star/build.gradle.kts b/samples/star/build.gradle.kts index add452d576..a305c9cbb5 100644 --- a/samples/star/build.gradle.kts +++ b/samples/star/build.gradle.kts @@ -27,7 +27,7 @@ kotlin { jvm() android { namespace = "com.slack.circuit.star" - compileSdk = 36 + compileSdk = 37 minSdk = 30 androidResources { enable = true } withHostTest { isIncludeAndroidResources = true } diff --git a/samples/star/coil-rule/build.gradle.kts b/samples/star/coil-rule/build.gradle.kts index 73831745ef..f6abc100d6 100644 --- a/samples/star/coil-rule/build.gradle.kts +++ b/samples/star/coil-rule/build.gradle.kts @@ -11,7 +11,7 @@ plugins { kotlin { android { namespace = "com.slack.circuit.sample.coil.test" - compileSdk = 36 + compileSdk = 37 } jvm() diff --git a/samples/tutorial/build.gradle.kts b/samples/tutorial/build.gradle.kts index e71ece6df2..93d3283cc8 100644 --- a/samples/tutorial/build.gradle.kts +++ b/samples/tutorial/build.gradle.kts @@ -13,7 +13,7 @@ plugins { kotlin { android { namespace = "com.slack.circuit.tutorial" - compileSdk = 36 + compileSdk = 37 } jvm { @OptIn(ExperimentalKotlinGradlePluginApi::class) From 4313d1ad3b7464bf29a00da99b7e0cd94ac8bc98 Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Thu, 28 May 2026 16:47:54 -0700 Subject: [PATCH 02/14] hack manifest gen for tests --- .../src/main/kotlin/circuit.android.gradle.kts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/build-logic/src/main/kotlin/circuit.android.gradle.kts b/build-logic/src/main/kotlin/circuit.android.gradle.kts index 536c169d15..3cba59a8f4 100644 --- a/build-logic/src/main/kotlin/circuit.android.gradle.kts +++ b/build-logic/src/main/kotlin/circuit.android.gradle.kts @@ -36,6 +36,22 @@ pluginManager.withPlugin("com.android.kotlin.multiplatform.library") { } } } + // todo Robolectric: targetSdk on host test compilations is not getting set on the manifest?? + tasks.matching { it.name == "processAndroidHostTestManifest" }.configureEach { + val sdkVersion = targetSdkVersion + doLast { + val manifestDir = outputs.files.files.first { it.isDirectory } + val manifest = File(manifestDir, "AndroidManifest.xml") + if (manifest.exists()) { + manifest.writeText( + manifest.readText().replace( + Regex("""android:targetSdkVersion="\d+""""), + """android:targetSdkVersion="$sdkVersion"""" + ) + ) + } + } + } dependencies { add("lintChecks", catalog.findLibrary("lints-compose").get()) } } From f0da76c9a5a70c775680d7d8724d474dfa82e682 Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Tue, 16 Jun 2026 09:19:30 -0700 Subject: [PATCH 03/14] 1.12.0-alpha02 --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7fd7d06983..e880c9d0d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,21 +6,21 @@ androidx-activity = "1.13.0" androidx-annotation = "1.10.0" androidx-appcompat = "1.7.1" androidx-browser = "1.10.0" -androidx-compose = "1.11.2" # Keep in sync with the androidx version used by jb-compose +androidx-compose = "1.12.0-alpha03" # Keep in sync with the androidx version used by jb-compose anvil = "0.5.4" atomicfu = "0.33.0" benchmark = "1.5.0-alpha06" coil = "3.5.0" -compose-runtime = "1.11.2" # Keep in sync with the androidx version used by jb-compose +compose-runtime = "1.12.0-alpha03" # Keep in sync with the androidx version used by jb-compose dagger = "2.59.2" datastore = "1.2.1" dokka = "2.2.0" eithernet = "2.0.0" -jb-compose = "1.12.0-alpha01" +jb-compose = "1.12.0-alpha02" jb-compose-material-icons-core = "1.7.3" jb-compose-material3 = "1.9.0" jb-compose-navigationevent = "1.1.0" -jb-lifecycle = "2.11.0-beta01" +jb-lifecycle = "2.11.0-beta02" jdk = "23" jvmTarget = "11" kct = "0.13.0" From 487e7db497248ba52dcf4430cf0ef07283a3c1c3 Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Tue, 16 Jun 2026 09:24:45 -0700 Subject: [PATCH 04/14] fix warnings --- circuitx/subcircuit-codegen-annotations/build.gradle.kts | 2 +- circuitx/subcircuit-test/build.gradle.kts | 3 ++- circuitx/subcircuit/build.gradle.kts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/circuitx/subcircuit-codegen-annotations/build.gradle.kts b/circuitx/subcircuit-codegen-annotations/build.gradle.kts index ac4543b8df..f4ed860053 100644 --- a/circuitx/subcircuit-codegen-annotations/build.gradle.kts +++ b/circuitx/subcircuit-codegen-annotations/build.gradle.kts @@ -20,7 +20,7 @@ kotlin { iosArm64() iosSimulatorArm64() macosArm64() - js(IR) { + js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() } diff --git a/circuitx/subcircuit-test/build.gradle.kts b/circuitx/subcircuit-test/build.gradle.kts index 5c3972a67b..8127b58362 100644 --- a/circuitx/subcircuit-test/build.gradle.kts +++ b/circuitx/subcircuit-test/build.gradle.kts @@ -16,12 +16,13 @@ kotlin { android { namespace = "com.slack.circuit.subcircuit.test" compileSdk = 36 + withHostTest {} } jvm() iosArm64() iosSimulatorArm64() macosArm64() - js(IR) { + js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() } diff --git a/circuitx/subcircuit/build.gradle.kts b/circuitx/subcircuit/build.gradle.kts index fc43c3dd82..9156b47e64 100644 --- a/circuitx/subcircuit/build.gradle.kts +++ b/circuitx/subcircuit/build.gradle.kts @@ -21,7 +21,7 @@ kotlin { iosArm64() iosSimulatorArm64() macosArm64() - js(IR) { + js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() } From e046904aba2fed7b8ffa433520c2faa42b6fde5e Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Tue, 16 Jun 2026 09:49:02 -0700 Subject: [PATCH 05/14] locks --- kotlin-js-store/package-lock.json | 10 ++++++++-- kotlin-js-store/wasm/package-lock.json | 20 ++++++++++++++++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/kotlin-js-store/package-lock.json b/kotlin-js-store/package-lock.json index 41bd5c4051..d68002f576 100644 --- a/kotlin-js-store/package-lock.json +++ b/kotlin-js-store/package-lock.json @@ -52,7 +52,7 @@ "packages/circuitx-subcircuit-test-test", "packages/counterbrowser", "packages/counterbrowser-test", - "packages_imported/skiko-js/0.148.1", + "packages_imported/skiko-js/0.148.2", "packages_imported/Kotlin-DateTime-library-kotlinx-datetime/0.7.1" ], "devDependencies": {} @@ -3297,7 +3297,7 @@ } }, "node_modules/skiko-js": { - "resolved": "packages_imported/skiko-js/0.148.1", + "resolved": "packages_imported/skiko-js/0.148.2", "link": true }, "node_modules/socket.io": { @@ -4164,6 +4164,12 @@ "packages_imported/skiko-js/0.148.1": { "name": "skiko-js", "version": "0.148.1", + "extraneous": true, + "devDependencies": {} + }, + "packages_imported/skiko-js/0.148.2": { + "name": "skiko-js", + "version": "0.148.2", "devDependencies": {} }, "packages_imported/skiko-js/0.9.22-2": { diff --git a/kotlin-js-store/wasm/package-lock.json b/kotlin-js-store/wasm/package-lock.json index c70540bf2b..c03c4582ae 100644 --- a/kotlin-js-store/wasm/package-lock.json +++ b/kotlin-js-store/wasm/package-lock.json @@ -54,8 +54,8 @@ "packages/counterbrowser-test", "packages/counterApp", "packages/counterApp-test", - "packages_imported/skiko-wasm-js/0.148.1", - "packages_imported/skiko-js-wasm-runtime/0.148.1", + "packages_imported/skiko-wasm-js/0.148.2", + "packages_imported/skiko-js-wasm-runtime/0.148.2", "packages_imported/Kotlin-DateTime-library-kotlinx-datetime-wasm-js/0.7.1" ], "devDependencies": {} @@ -250,11 +250,11 @@ "link": true }, "node_modules/skiko-js-wasm-runtime": { - "resolved": "packages_imported/skiko-js-wasm-runtime/0.148.1", + "resolved": "packages_imported/skiko-js-wasm-runtime/0.148.2", "link": true }, "node_modules/skiko-wasm-js": { - "resolved": "packages_imported/skiko-wasm-js/0.148.1", + "resolved": "packages_imported/skiko-wasm-js/0.148.2", "link": true }, "packages_imported/Kotlin-DateTime-library-kotlinx-datetime-wasm-js/0.6.0": { @@ -296,6 +296,12 @@ "packages_imported/skiko-js-wasm-runtime/0.148.1": { "name": "skiko-js-wasm-runtime", "version": "0.148.1", + "extraneous": true, + "devDependencies": {} + }, + "packages_imported/skiko-js-wasm-runtime/0.148.2": { + "name": "skiko-js-wasm-runtime", + "version": "0.148.2", "devDependencies": {} }, "packages_imported/skiko-js-wasm-runtime/0.9.22": { @@ -367,6 +373,12 @@ "packages_imported/skiko-wasm-js/0.148.1": { "name": "skiko-wasm-js", "version": "0.148.1", + "extraneous": true, + "devDependencies": {} + }, + "packages_imported/skiko-wasm-js/0.148.2": { + "name": "skiko-wasm-js", + "version": "0.148.2", "devDependencies": {} }, "packages_imported/skiko-wasm-js/0.9.22": { From 9da1422fccd849a9938cdf7c5164a4fc4175a9b3 Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Tue, 16 Jun 2026 09:52:29 -0700 Subject: [PATCH 06/14] baselines --- backstack/dependencies/androidRuntimeClasspath.txt | 2 ++ .../dependencies/androidRuntimeClasspath.txt | 2 ++ .../dependencies/androidRuntimeClasspath.txt | 2 ++ .../dependencies/androidRuntimeClasspath.txt | 2 ++ .../dependencies/androidRuntimeClasspath.txt | 2 ++ .../dependencies/androidRuntimeClasspath.txt | 13 ++----------- .../dependencies/jvmRuntimeClasspath.txt | 10 ++++++---- .../dependencies/androidRuntimeClasspath.txt | 13 ++----------- .../subcircuit/dependencies/jvmRuntimeClasspath.txt | 10 ++++++---- 9 files changed, 26 insertions(+), 30 deletions(-) diff --git a/backstack/dependencies/androidRuntimeClasspath.txt b/backstack/dependencies/androidRuntimeClasspath.txt index 66b68e8be0..6af4060230 100644 --- a/backstack/dependencies/androidRuntimeClasspath.txt +++ b/backstack/dependencies/androidRuntimeClasspath.txt @@ -52,6 +52,8 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-android +androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android diff --git a/circuit-overlay/dependencies/androidRuntimeClasspath.txt b/circuit-overlay/dependencies/androidRuntimeClasspath.txt index d823e234af..88f0a2468b 100644 --- a/circuit-overlay/dependencies/androidRuntimeClasspath.txt +++ b/circuit-overlay/dependencies/androidRuntimeClasspath.txt @@ -60,6 +60,8 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-android +androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android diff --git a/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt b/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt index 905d50e58f..e755b85ada 100644 --- a/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt +++ b/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt @@ -52,6 +52,8 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-android +androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android diff --git a/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt b/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt index d823e234af..88f0a2468b 100644 --- a/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt +++ b/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt @@ -60,6 +60,8 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-android +androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android diff --git a/circuitx/effects/dependencies/androidRuntimeClasspath.txt b/circuitx/effects/dependencies/androidRuntimeClasspath.txt index 6340b256d3..ac5423c6b6 100644 --- a/circuitx/effects/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/effects/dependencies/androidRuntimeClasspath.txt @@ -54,6 +54,8 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-android +androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android diff --git a/circuitx/subcircuit-test/dependencies/androidRuntimeClasspath.txt b/circuitx/subcircuit-test/dependencies/androidRuntimeClasspath.txt index f33b89c705..48903b68d1 100644 --- a/circuitx/subcircuit-test/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/subcircuit-test/dependencies/androidRuntimeClasspath.txt @@ -42,17 +42,12 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -65,9 +60,8 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager -androidx.print:print +androidx.navigationevent:navigationevent-android +androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -76,7 +70,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core @@ -89,8 +82,6 @@ com.google.guava:listenablefuture org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate org.jetbrains.compose.animation:animation-core diff --git a/circuitx/subcircuit-test/dependencies/jvmRuntimeClasspath.txt b/circuitx/subcircuit-test/dependencies/jvmRuntimeClasspath.txt index 5a70db85e4..daaffd696b 100644 --- a/circuitx/subcircuit-test/dependencies/jvmRuntimeClasspath.txt +++ b/circuitx/subcircuit-test/dependencies/jvmRuntimeClasspath.txt @@ -17,10 +17,14 @@ androidx.lifecycle:lifecycle-runtime-compose-desktop androidx.lifecycle:lifecycle-runtime-compose androidx.lifecycle:lifecycle-runtime-desktop androidx.lifecycle:lifecycle-runtime +androidx.lifecycle:lifecycle-viewmodel-compose-desktop +androidx.lifecycle:lifecycle-viewmodel-compose androidx.lifecycle:lifecycle-viewmodel-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-compose-desktop +androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent-desktop androidx.navigationevent:navigationevent androidx.savedstate:savedstate-compose-desktop @@ -35,8 +39,8 @@ org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel +org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop +org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose-desktop org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate @@ -52,8 +56,6 @@ org.jetbrains.compose.runtime:runtime-desktop org.jetbrains.compose.runtime:runtime-saveable-desktop org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime -org.jetbrains.compose.ui:ui-backhandler-desktop -org.jetbrains.compose.ui:ui-backhandler org.jetbrains.compose.ui:ui-desktop org.jetbrains.compose.ui:ui-geometry-desktop org.jetbrains.compose.ui:ui-geometry diff --git a/circuitx/subcircuit/dependencies/androidRuntimeClasspath.txt b/circuitx/subcircuit/dependencies/androidRuntimeClasspath.txt index 70686fe926..88f0a2468b 100644 --- a/circuitx/subcircuit/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/subcircuit/dependencies/androidRuntimeClasspath.txt @@ -42,17 +42,12 @@ androidx.core:core-ktx androidx.core:core-viewtree androidx.core:core androidx.customview:customview-poolingcontainer -androidx.documentfile:documentfile -androidx.dynamicanimation:dynamicanimation androidx.emoji2:emoji2 androidx.graphics:graphics-path androidx.interpolator:interpolator -androidx.legacy:legacy-support-core-utils androidx.lifecycle:lifecycle-common-jvm androidx.lifecycle:lifecycle-common -androidx.lifecycle:lifecycle-livedata-core-ktx androidx.lifecycle:lifecycle-livedata-core -androidx.lifecycle:lifecycle-livedata androidx.lifecycle:lifecycle-process androidx.lifecycle:lifecycle-runtime-android androidx.lifecycle:lifecycle-runtime-compose-android @@ -65,9 +60,8 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.loader:loader -androidx.localbroadcastmanager:localbroadcastmanager -androidx.print:print +androidx.navigationevent:navigationevent-android +androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -76,7 +70,6 @@ androidx.savedstate:savedstate-ktx androidx.savedstate:savedstate androidx.startup:startup-runtime androidx.tracing:tracing -androidx.transition:transition androidx.versionedparcelable:versionedparcelable androidx.window:window-core-android androidx.window:window-core @@ -85,8 +78,6 @@ com.google.guava:listenablefuture org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate org.jetbrains.compose.animation:animation-core diff --git a/circuitx/subcircuit/dependencies/jvmRuntimeClasspath.txt b/circuitx/subcircuit/dependencies/jvmRuntimeClasspath.txt index 9165dd247e..5bba96688d 100644 --- a/circuitx/subcircuit/dependencies/jvmRuntimeClasspath.txt +++ b/circuitx/subcircuit/dependencies/jvmRuntimeClasspath.txt @@ -17,10 +17,14 @@ androidx.lifecycle:lifecycle-runtime-compose-desktop androidx.lifecycle:lifecycle-runtime-compose androidx.lifecycle:lifecycle-runtime-desktop androidx.lifecycle:lifecycle-runtime +androidx.lifecycle:lifecycle-viewmodel-compose-desktop +androidx.lifecycle:lifecycle-viewmodel-compose androidx.lifecycle:lifecycle-viewmodel-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel +androidx.navigationevent:navigationevent-compose-desktop +androidx.navigationevent:navigationevent-compose androidx.navigationevent:navigationevent-desktop androidx.navigationevent:navigationevent androidx.savedstate:savedstate-compose-desktop @@ -31,8 +35,8 @@ org.jetbrains.androidx.lifecycle:lifecycle-common org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate -org.jetbrains.androidx.lifecycle:lifecycle-viewmodel +org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop +org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose-desktop org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate @@ -48,8 +52,6 @@ org.jetbrains.compose.runtime:runtime-desktop org.jetbrains.compose.runtime:runtime-saveable-desktop org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime -org.jetbrains.compose.ui:ui-backhandler-desktop -org.jetbrains.compose.ui:ui-backhandler org.jetbrains.compose.ui:ui-desktop org.jetbrains.compose.ui:ui-geometry-desktop org.jetbrains.compose.ui:ui-geometry From 9967341ab17fb9d127f8ed3e37d4465e6175fb7d Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Tue, 16 Jun 2026 10:25:22 -0700 Subject: [PATCH 07/14] New compile = 37 --- circuitx/subcircuit-codegen-annotations/build.gradle.kts | 2 +- circuitx/subcircuit-test/build.gradle.kts | 4 ++-- circuitx/subcircuit/build.gradle.kts | 2 +- samples/inbox/build.gradle.kts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/circuitx/subcircuit-codegen-annotations/build.gradle.kts b/circuitx/subcircuit-codegen-annotations/build.gradle.kts index f4ed860053..c56bd69223 100644 --- a/circuitx/subcircuit-codegen-annotations/build.gradle.kts +++ b/circuitx/subcircuit-codegen-annotations/build.gradle.kts @@ -14,7 +14,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.subcircuit.codegen.annotations" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/circuitx/subcircuit-test/build.gradle.kts b/circuitx/subcircuit-test/build.gradle.kts index 8127b58362..e53d766413 100644 --- a/circuitx/subcircuit-test/build.gradle.kts +++ b/circuitx/subcircuit-test/build.gradle.kts @@ -15,8 +15,8 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.subcircuit.test" - compileSdk = 36 - withHostTest {} + compileSdk = 37 + withHostTest { isReturnDefaultValues = true } } jvm() iosArm64() diff --git a/circuitx/subcircuit/build.gradle.kts b/circuitx/subcircuit/build.gradle.kts index 9156b47e64..209dcbc630 100644 --- a/circuitx/subcircuit/build.gradle.kts +++ b/circuitx/subcircuit/build.gradle.kts @@ -15,7 +15,7 @@ kotlin { // region KMP Targets android { namespace = "com.slack.circuit.subcircuit" - compileSdk = 36 + compileSdk = 37 } jvm() iosArm64() diff --git a/samples/inbox/build.gradle.kts b/samples/inbox/build.gradle.kts index 457252812f..54327cbc17 100644 --- a/samples/inbox/build.gradle.kts +++ b/samples/inbox/build.gradle.kts @@ -18,7 +18,7 @@ plugins { kotlin { android { namespace = "com.slack.circuit.sample.inbox" - compileSdk = 36 + compileSdk = 37 withHostTest { isIncludeAndroidResources = true isReturnDefaultValues = true From 2dd06038fc7143fd6cc0337e0ff4d5526a0a91f8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 2 Jul 2026 18:54:22 +0000 Subject: [PATCH 08/14] Update jb-compose to 1.12.0-beta01 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c7fdde54a8..05532b0829 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ dagger = "2.60" datastore = "1.2.1" dokka = "2.2.0" eithernet = "2.0.0" -jb-compose = "1.12.0-alpha02" +jb-compose = "1.12.0-beta01" jb-compose-material-icons-core = "1.7.3" jb-compose-material3 = "1.9.0" jb-compose-navigationevent = "1.1.0" From 4ad14383261c606c523b4707df25d7bac7df6f03 Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Thu, 16 Jul 2026 15:11:19 -0700 Subject: [PATCH 09/14] Update jb-compose to 1.12.0-beta02 Co-Authored-By: Claude --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 41a9c0bc08..498d2d772c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ dagger = "2.60.1" datastore = "1.2.1" dokka = "2.2.0" eithernet = "2.0.0" -jb-compose = "1.12.0-beta01" +jb-compose = "1.12.0-beta02" jb-compose-material-icons-core = "1.7.3" jb-compose-material3 = "1.9.0" jb-compose-navigationevent = "1.1.0" From 7f0ea5e601330125144002fd08a6ec263dd297df Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Thu, 16 Jul 2026 16:21:14 -0700 Subject: [PATCH 10/14] Declare js/wasmJs executable binaries for Compose UI tests Compose 1.12 adds checkComposeUiTestConfigurationForJs/WasmJs (CMP-4906), which requires binaries.executable() on js/wasmJs targets so the Skiko runtime is bundled by webpack. Add it to every affected module and refresh the js/wasm package locks (skiko 0.148.2 to 0.150.1 plus webpack deps). Co-Authored-By: Claude --- backstack/build.gradle.kts | 1 + circuit-codegen-annotations/build.gradle.kts | 2 + circuit-foundation/build.gradle.kts | 1 + circuit-overlay/build.gradle.kts | 2 + circuit-retained/build.gradle.kts | 2 + circuit-runtime-navigation/build.gradle.kts | 2 + circuit-runtime-presenter/build.gradle.kts | 2 + circuit-runtime-screen/build.gradle.kts | 2 + circuit-runtime-ui/build.gradle.kts | 2 + circuit-runtime/build.gradle.kts | 2 + circuit-serialization/build.gradle.kts | 2 + circuit-shared-elements/build.gradle.kts | 2 + circuit-test/build.gradle.kts | 2 + circuitx/effects/build.gradle.kts | 1 + circuitx/gesture-navigation/build.gradle.kts | 2 + circuitx/navigation/build.gradle.kts | 2 + circuitx/overlays/build.gradle.kts | 2 + .../build.gradle.kts | 2 + circuitx/subcircuit-test/build.gradle.kts | 2 + circuitx/subcircuit/build.gradle.kts | 2 + internal-runtime/build.gradle.kts | 2 + internal-test-utils/build.gradle.kts | 2 + kotlin-js-store/package-lock.json | 2585 ++++++++++++++++- kotlin-js-store/wasm/package-lock.json | 20 +- samples/counter/build.gradle.kts | 2 + 25 files changed, 2562 insertions(+), 86 deletions(-) diff --git a/backstack/build.gradle.kts b/backstack/build.gradle.kts index b91ad0006a..fbed27c69c 100644 --- a/backstack/build.gradle.kts +++ b/backstack/build.gradle.kts @@ -27,6 +27,7 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { diff --git a/circuit-codegen-annotations/build.gradle.kts b/circuit-codegen-annotations/build.gradle.kts index f704df596f..1616cecad5 100644 --- a/circuit-codegen-annotations/build.gradle.kts +++ b/circuit-codegen-annotations/build.gradle.kts @@ -40,11 +40,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuit-foundation/build.gradle.kts b/circuit-foundation/build.gradle.kts index 049309b472..097a8f7c78 100644 --- a/circuit-foundation/build.gradle.kts +++ b/circuit-foundation/build.gradle.kts @@ -35,6 +35,7 @@ kotlin { enabled = false } } + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { diff --git a/circuit-overlay/build.gradle.kts b/circuit-overlay/build.gradle.kts index ef3380c35e..611b48b1f0 100644 --- a/circuit-overlay/build.gradle.kts +++ b/circuit-overlay/build.gradle.kts @@ -25,11 +25,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuit-retained/build.gradle.kts b/circuit-retained/build.gradle.kts index 4cce0cb381..52dcec86e9 100644 --- a/circuit-retained/build.gradle.kts +++ b/circuit-retained/build.gradle.kts @@ -36,11 +36,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuit-runtime-navigation/build.gradle.kts b/circuit-runtime-navigation/build.gradle.kts index e0fe548207..cba111be09 100644 --- a/circuit-runtime-navigation/build.gradle.kts +++ b/circuit-runtime-navigation/build.gradle.kts @@ -32,11 +32,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuit-runtime-presenter/build.gradle.kts b/circuit-runtime-presenter/build.gradle.kts index a56c41ffea..6992c09753 100644 --- a/circuit-runtime-presenter/build.gradle.kts +++ b/circuit-runtime-presenter/build.gradle.kts @@ -31,11 +31,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuit-runtime-screen/build.gradle.kts b/circuit-runtime-screen/build.gradle.kts index e7b0849042..ad641ca657 100644 --- a/circuit-runtime-screen/build.gradle.kts +++ b/circuit-runtime-screen/build.gradle.kts @@ -32,11 +32,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuit-runtime-ui/build.gradle.kts b/circuit-runtime-ui/build.gradle.kts index 1aec951f16..35bb7b3d65 100644 --- a/circuit-runtime-ui/build.gradle.kts +++ b/circuit-runtime-ui/build.gradle.kts @@ -23,11 +23,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuit-runtime/build.gradle.kts b/circuit-runtime/build.gradle.kts index 88cb4c6288..dca66b7917 100644 --- a/circuit-runtime/build.gradle.kts +++ b/circuit-runtime/build.gradle.kts @@ -31,11 +31,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuit-serialization/build.gradle.kts b/circuit-serialization/build.gradle.kts index 4174a05cd9..87beb9e869 100644 --- a/circuit-serialization/build.gradle.kts +++ b/circuit-serialization/build.gradle.kts @@ -35,11 +35,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuit-shared-elements/build.gradle.kts b/circuit-shared-elements/build.gradle.kts index 784cbbd77e..9a94f64d2b 100644 --- a/circuit-shared-elements/build.gradle.kts +++ b/circuit-shared-elements/build.gradle.kts @@ -24,11 +24,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion applyDefaultHierarchyTemplate() diff --git a/circuit-test/build.gradle.kts b/circuit-test/build.gradle.kts index f5dd1ec0b7..2798a1f0d4 100644 --- a/circuit-test/build.gradle.kts +++ b/circuit-test/build.gradle.kts @@ -26,11 +26,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuitx/effects/build.gradle.kts b/circuitx/effects/build.gradle.kts index 85142df892..32c6289c85 100644 --- a/circuitx/effects/build.gradle.kts +++ b/circuitx/effects/build.gradle.kts @@ -25,6 +25,7 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { diff --git a/circuitx/gesture-navigation/build.gradle.kts b/circuitx/gesture-navigation/build.gradle.kts index 8c82dfb1ae..792aeae142 100644 --- a/circuitx/gesture-navigation/build.gradle.kts +++ b/circuitx/gesture-navigation/build.gradle.kts @@ -23,11 +23,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser { testTask { enabled = false } } + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser { testTask { enabled = false } } + binaries.executable() } // endregion diff --git a/circuitx/navigation/build.gradle.kts b/circuitx/navigation/build.gradle.kts index fd36876110..6b01b0e637 100644 --- a/circuitx/navigation/build.gradle.kts +++ b/circuitx/navigation/build.gradle.kts @@ -24,11 +24,13 @@ kotlin { js { outputModuleName.set(property("POM_ARTIFACT_ID").toString()) browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName.set(property("POM_ARTIFACT_ID").toString()) browser() + binaries.executable() } // endregion diff --git a/circuitx/overlays/build.gradle.kts b/circuitx/overlays/build.gradle.kts index acad048aa9..c8346df81a 100644 --- a/circuitx/overlays/build.gradle.kts +++ b/circuitx/overlays/build.gradle.kts @@ -24,11 +24,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuitx/subcircuit-codegen-annotations/build.gradle.kts b/circuitx/subcircuit-codegen-annotations/build.gradle.kts index 8a284f9484..7054950c27 100644 --- a/circuitx/subcircuit-codegen-annotations/build.gradle.kts +++ b/circuitx/subcircuit-codegen-annotations/build.gradle.kts @@ -22,11 +22,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuitx/subcircuit-test/build.gradle.kts b/circuitx/subcircuit-test/build.gradle.kts index 36f0599cad..cfe9244780 100644 --- a/circuitx/subcircuit-test/build.gradle.kts +++ b/circuitx/subcircuit-test/build.gradle.kts @@ -24,11 +24,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/circuitx/subcircuit/build.gradle.kts b/circuitx/subcircuit/build.gradle.kts index 8d0089589b..0698f60ef9 100644 --- a/circuitx/subcircuit/build.gradle.kts +++ b/circuitx/subcircuit/build.gradle.kts @@ -23,11 +23,13 @@ kotlin { js { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = property("POM_ARTIFACT_ID").toString() browser() + binaries.executable() } // endregion diff --git a/internal-runtime/build.gradle.kts b/internal-runtime/build.gradle.kts index cea6697c83..d16de46eaf 100644 --- a/internal-runtime/build.gradle.kts +++ b/internal-runtime/build.gradle.kts @@ -23,11 +23,13 @@ kotlin { js { outputModuleName = "internal-runtime" browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = "internal-runtime" browser() + binaries.executable() } // endregion diff --git a/internal-test-utils/build.gradle.kts b/internal-test-utils/build.gradle.kts index abe8b3e5e7..b315422bcb 100644 --- a/internal-test-utils/build.gradle.kts +++ b/internal-test-utils/build.gradle.kts @@ -24,11 +24,13 @@ kotlin { js { outputModuleName = "internal-test-utils" browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = "internal-test-utils" browser() + binaries.executable() } // endregion diff --git a/kotlin-js-store/package-lock.json b/kotlin-js-store/package-lock.json index 72e1a7ac7d..8de160daa1 100644 --- a/kotlin-js-store/package-lock.json +++ b/kotlin-js-store/package-lock.json @@ -54,7 +54,7 @@ "packages/circuitx-subcircuit-test-test", "packages/counterbrowser", "packages/counterbrowser-test", - "packages_imported/skiko-js/0.148.2", + "packages_imported/skiko-js/0.150.1", "packages_imported/Kotlin-DateTime-library-kotlinx-datetime/0.7.1" ], "devDependencies": {} @@ -223,6 +223,626 @@ "resolved": "https://registry.npmjs.org/@js-joda/core/-/core-3.2.0.tgz", "integrity": "sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==" }, + "node_modules/@jsonjoy.com/base64": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz", + "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/buffers": { + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/buffers/-/buffers-17.67.0.tgz", + "integrity": "sha512-tfExRpYxBvi32vPs9ZHaTjSP4fHAfzSmcahOfNxtvGHcyJel+aibkPlGeBB+7AoC6hL7lXIE++8okecBxx7lcw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/codegen": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/codegen/-/codegen-1.0.0.tgz", + "integrity": "sha512-E8Oy+08cmCf0EK/NMxpaJZmOxPqM+6iSe2S4nlSBrPZOORoDJILxtbSUEDKQyTamm/BVAhIGllOBNU79/dwf0g==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-core": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-core/-/fs-core-4.64.0.tgz", + "integrity": "sha512-zs2TAq7Six5jgMuoMNjpspAvOP3mhtgq/k1UyQodEzCtQi/N83y2/y+zcvnZSGp/Rxq96DBN+bValOBQAyn/ew==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "@jsonjoy.com/fs-node-utils": "4.64.0", + "thingies": "^2.5.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-fsa": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-fsa/-/fs-fsa-4.64.0.tgz", + "integrity": "sha512-nMWOVbkLFyEgmXZih3wyvxA9XpgyyqyfrINMHvEFqhi7uqfRl7c9ERJt6yX7vgMPrB9Uo+OJO+Spa0cFzPD01w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/fs-core": "4.64.0", + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "@jsonjoy.com/fs-node-utils": "4.64.0", + "thingies": "^2.5.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-node": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node/-/fs-node-4.64.0.tgz", + "integrity": "sha512-dO+NNkODbUli4uV42bcNrrLvq5rE7SNpdZ5TNd0dtbLsAaNK3MDiIC9lUi+brboGoIjW6vd2fB1qao60nrk5xA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/fs-core": "4.64.0", + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "@jsonjoy.com/fs-node-utils": "4.64.0", + "@jsonjoy.com/fs-print": "4.64.0", + "@jsonjoy.com/fs-snapshot": "4.64.0", + "glob-to-regex.js": "^1.0.0", + "thingies": "^2.5.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-node-builtins": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node-builtins/-/fs-node-builtins-4.64.0.tgz", + "integrity": "sha512-/o7WRFhUWaM/fOrslwLZGnzn4RmRILykn+lAL+mNObqqRNw+CQSiij6hpCeZ+C7buhdoVo7go/OYqzaSUfDYmA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-node-to-fsa": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node-to-fsa/-/fs-node-to-fsa-4.64.0.tgz", + "integrity": "sha512-WDD9WVs0hb7UAEKTgZW2f66WDrbj7gIIWwpP3spbLyXa0rghtUaFTB8L4gdR3ZCWwiKIsj38/CNijpVmpnuPUw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/fs-fsa": "4.64.0", + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "@jsonjoy.com/fs-node-utils": "4.64.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-node-utils": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node-utils/-/fs-node-utils-4.64.0.tgz", + "integrity": "sha512-k5Indsx9hWW9xSF7Y6oSKKwtCUNhzZxadub3owhIlitc+iMRVlPPdX2duTKQWBL3qNWpXya8jykgaaWpheeS4w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "glob-to-regex.js": "^1.0.1" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-print": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-print/-/fs-print-4.64.0.tgz", + "integrity": "sha512-PHZFccchvkhWrwPWHjmVAhbC3vSHCtyZvlZfJJ3ho2bnzl450hXri6/8e6pbkWdH+SkmLXNml0sV8e5HDAfxKw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/fs-node-utils": "4.64.0", + "tree-dump": "^1.1.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-snapshot": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-snapshot/-/fs-snapshot-4.64.0.tgz", + "integrity": "sha512-oM7UDeL83q6NBzzsfKAsYKXKVXlykKFqqOLh4xZZKAzzROTlInkPbc6LTDGThEOnPiFiUzA7tYziHG9xavd76Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/buffers": "^17.65.0", + "@jsonjoy.com/fs-node-utils": "4.64.0", + "@jsonjoy.com/json-pack": "^17.65.0", + "@jsonjoy.com/util": "^17.65.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-snapshot/node_modules/@jsonjoy.com/base64": { + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-17.67.0.tgz", + "integrity": "sha512-5SEsJGsm15aP8TQGkDfJvz9axgPwAEm98S5DxOuYe8e1EbfajcDmgeXXzccEjh+mLnjqEKrkBdjHWS5vFNwDdw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-snapshot/node_modules/@jsonjoy.com/codegen": { + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/codegen/-/codegen-17.67.0.tgz", + "integrity": "sha512-idnkUplROpdBOV0HMcwhsCUS5TRUi9poagdGs70A6S4ux9+/aPuKbh8+UYRTLYQHtXvAdNfQWXDqZEx5k4Dj2Q==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-snapshot/node_modules/@jsonjoy.com/json-pack": { + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-17.67.0.tgz", + "integrity": "sha512-t0ejURcGaZsn1ClbJ/3kFqSOjlryd92eQY465IYrezsXmPcfHPE/av4twRSxf6WE+TkZgLY+71vCZbiIiFKA/w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/base64": "17.67.0", + "@jsonjoy.com/buffers": "17.67.0", + "@jsonjoy.com/codegen": "17.67.0", + "@jsonjoy.com/json-pointer": "17.67.0", + "@jsonjoy.com/util": "17.67.0", + "hyperdyperid": "^1.2.0", + "thingies": "^2.5.0", + "tree-dump": "^1.1.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-snapshot/node_modules/@jsonjoy.com/json-pointer": { + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pointer/-/json-pointer-17.67.0.tgz", + "integrity": "sha512-+iqOFInH+QZGmSuaybBUNdh7yvNrXvqR+h3wjXm0N/3JK1EyyFAeGJvqnmQL61d1ARLlk/wJdFKSL+LHJ1eaUA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/util": "17.67.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/fs-snapshot/node_modules/@jsonjoy.com/util": { + "version": "17.67.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-17.67.0.tgz", + "integrity": "sha512-6+8xBaz1rLSohlGh68D1pdw3AwDi9xydm8QNlAFkvnavCJYSze+pxoW2VKP8p308jtlMRLs5NTHfPlZLd4w7ew==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/buffers": "17.67.0", + "@jsonjoy.com/codegen": "17.67.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/json-pack": { + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.21.0.tgz", + "integrity": "sha512-+AKG+R2cfZMShzrF2uQw34v3zbeDYUqnQ+jg7ORic3BGtfw9p/+N6RJbq/kkV8JmYZaINknaEQ2m0/f693ZPpg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/base64": "^1.1.2", + "@jsonjoy.com/buffers": "^1.2.0", + "@jsonjoy.com/codegen": "^1.0.0", + "@jsonjoy.com/json-pointer": "^1.0.2", + "@jsonjoy.com/util": "^1.9.0", + "hyperdyperid": "^1.2.0", + "thingies": "^2.5.0", + "tree-dump": "^1.1.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/json-pack/node_modules/@jsonjoy.com/buffers": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/buffers/-/buffers-1.2.1.tgz", + "integrity": "sha512-12cdlDwX4RUM3QxmUbVJWqZ/mrK6dFQH4Zxq6+r1YXKXYBNgZXndx2qbCJwh3+WWkCSn67IjnlG3XYTvmvYtgA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/json-pointer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pointer/-/json-pointer-1.0.2.tgz", + "integrity": "sha512-Fsn6wM2zlDzY1U+v4Nc8bo3bVqgfNTGcn6dMgs6FjrEnt4ZCe60o6ByKRjOGlI2gow0aE/Q41QOigdTqkyK5fg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/codegen": "^1.0.0", + "@jsonjoy.com/util": "^1.9.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/util": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.9.0.tgz", + "integrity": "sha512-pLuQo+VPRnN8hfPqUTLTHk126wuYdXVxE6aDmjSeV4NCAgyxWbiOIeNJVtID3h1Vzpoi9m4jXezf73I6LgabgQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/buffers": "^1.0.0", + "@jsonjoy.com/codegen": "^1.0.0" + }, + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@jsonjoy.com/util/node_modules/@jsonjoy.com/buffers": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/buffers/-/buffers-1.2.1.tgz", + "integrity": "sha512-12cdlDwX4RUM3QxmUbVJWqZ/mrK6dFQH4Zxq6+r1YXKXYBNgZXndx2qbCJwh3+WWkCSn67IjnlG3XYTvmvYtgA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/@leichtgewicht/ip-codec": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz", + "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@noble/hashes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@peculiar/asn1-cms": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-cms/-/asn1-cms-2.8.0.tgz", + "integrity": "sha512-NgekZOrSJFSBFLFoLfwePguAWAx7z1+f2TEsWFUMyiqqfntZ4+S/S5hzqME3q4pCA0iOsFKdwiQ35dwY24eVqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-schema": "^2.8.0", + "@peculiar/asn1-x509": "^2.8.0", + "@peculiar/asn1-x509-attr": "^2.8.0", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/asn1-csr": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-csr/-/asn1-csr-2.8.0.tgz", + "integrity": "sha512-akbF8+uvleHs8sejNPQxwmVFuInAg6FMNHOwMILXfP518YfFJwdR3jr6oNUPOaEJfuEhn/vkNOCIT6ASUd4mbg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-schema": "^2.8.0", + "@peculiar/asn1-x509": "^2.8.0", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/asn1-ecc": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-ecc/-/asn1-ecc-2.8.0.tgz", + "integrity": "sha512-ohwlk+u9Rv2NOAY1c6MfHj45ATVF8R1DUN/WCgABiRtLi2ZftlZWZX7KvpAbU8v9xPcmoILfELeEABj/rn18AQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-schema": "^2.8.0", + "@peculiar/asn1-x509": "^2.8.0", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/asn1-pfx": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-pfx/-/asn1-pfx-2.8.0.tgz", + "integrity": "sha512-5yof1ytoB++RQtaFbqSUJ8pxDJtZT6vbVqZ8XoJ61ph7UjNVvfFwAilnCodqkNsAodpy13gDhoxZXw00pghnyg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-cms": "^2.8.0", + "@peculiar/asn1-pkcs8": "^2.8.0", + "@peculiar/asn1-rsa": "^2.8.0", + "@peculiar/asn1-schema": "^2.8.0", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/asn1-pkcs8": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-pkcs8/-/asn1-pkcs8-2.8.0.tgz", + "integrity": "sha512-qAKXtLpBEw9LqhKpjw3ajZSXlBur+ipW+y2ivVBQAG6F6qRx94yO+1ZR4mvw+YaCfKSaOzLeYEzsPaBp4SJELA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-schema": "^2.8.0", + "@peculiar/asn1-x509": "^2.8.0", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/asn1-pkcs9": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-pkcs9/-/asn1-pkcs9-2.8.0.tgz", + "integrity": "sha512-b5nDWCnkV60+cQ141D6sVVwK9nz64R5n3zSVnklGd+ECdkW2Ol3U1a6yYFlalpSOaD557yuJB64A+q42jG7lUQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-cms": "^2.8.0", + "@peculiar/asn1-pfx": "^2.8.0", + "@peculiar/asn1-pkcs8": "^2.8.0", + "@peculiar/asn1-schema": "^2.8.0", + "@peculiar/asn1-x509": "^2.8.0", + "@peculiar/asn1-x509-attr": "^2.8.0", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/asn1-rsa": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-rsa/-/asn1-rsa-2.8.0.tgz", + "integrity": "sha512-zHEUlCqB2mk7x2lxDwHHJy7hWZOPdGHVlsmITWKB5/PbQo61atbu9PJ/0r9dQNMwFzbKPXZ8uK8/91eUhRznSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-schema": "^2.8.0", + "@peculiar/asn1-x509": "^2.8.0", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/asn1-schema": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.8.0.tgz", + "integrity": "sha512-7YT0U/ze0tF2QOBbE15gKZwy5tvgGyLRiRHLzhlbOpf7BT032oBSd0haZqXn5W6l26WLlu3dyxzjM+2638/z2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/utils": "^2.0.2", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/asn1-x509": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-x509/-/asn1-x509-2.8.0.tgz", + "integrity": "sha512-N0CMuhWUzsWEVq6F1q9X6+VKUnWzSW+cSVg+aPaGGwDdbFoFWTYgin5MHwXgpWd6y9COMBxnfy/Qc+Xc7F0Zwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-schema": "^2.8.0", + "@peculiar/utils": "^2.0.2", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/asn1-x509-attr": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-x509-attr/-/asn1-x509-attr-2.8.0.tgz", + "integrity": "sha512-tHjkfS/qhMnmrlB2J9NhflQlQ7In3khO3CfmVrriOlpTeErY9ZIKOso1hQ5JQiyrJ7ShvqVPk7E5fQmbclkSKA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-schema": "^2.8.0", + "@peculiar/asn1-x509": "^2.8.0", + "asn1js": "^3.0.10", + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@peculiar/utils/-/utils-2.0.3.tgz", + "integrity": "sha512-+oL3HPFRIZ1St2K50lWCXiioIgSoxzz7R1J3uF6neO2yl1sgmpgY6XXJH4BdpoDkMWznQTeYF6oWNDZLCdQ4eQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^2.8.1" + } + }, + "node_modules/@peculiar/x509": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/@peculiar/x509/-/x509-1.14.3.tgz", + "integrity": "sha512-C2Xj8FZ0uHWeCXXqX5B4/gVFQmtSkiuOolzAgutjTfseNOHT3pUjljDZsTSxXFGgio54bCzVFqmEOUrIVk8RDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/asn1-cms": "^2.6.0", + "@peculiar/asn1-csr": "^2.6.0", + "@peculiar/asn1-ecc": "^2.6.0", + "@peculiar/asn1-pkcs9": "^2.6.0", + "@peculiar/asn1-rsa": "^2.6.0", + "@peculiar/asn1-schema": "^2.6.0", + "@peculiar/asn1-x509": "^2.6.0", + "pvtsutils": "^1.3.6", + "reflect-metadata": "^0.2.2", + "tslib": "^2.8.1", + "tsyringe": "^4.10.0" + }, + "engines": { + "node": ">=20.0.0" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -239,6 +859,48 @@ "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==", "dev": true }, + "node_modules/@types/body-parser": { + "version": "1.19.6", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", + "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "node_modules/@types/bonjour": { + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", + "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/connect": { + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/connect-history-api-fallback": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz", + "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express-serve-static-core": "*", + "@types/node": "*" + } + }, "node_modules/@types/cors": { "version": "2.8.19", "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz", @@ -258,35 +920,169 @@ "@types/json-schema": "*" } }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "node_modules/@types/estree": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "dev": true + }, + "node_modules/@types/express": { + "version": "4.17.25", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.25.tgz", + "integrity": "sha512-dVd04UKsfpINUnK0yBoYHDF3xu7xVH4BuDotC/xGuycx4CgbP48X/KF/586bcObxT0HENHXEU8Nqtu6NR+eKhw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.33", + "@types/qs": "*", + "@types/serve-static": "^1" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "4.19.9", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.9.tgz", + "integrity": "sha512-QP2ESEe/ImWY0HDwNAnK9PvEffUyhLTnWkk7KXzHfyeWAnlrDe1fN77bXl6ia8KT3wPlmA7t9/VPRpnf4Ex9sg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, + "node_modules/@types/http-errors": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz", + "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/http-proxy": { + "version": "1.17.17", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.17.tgz", + "integrity": "sha512-ED6LB+Z1AVylNTu7hdzuBqOgMnvG/ld6wGCG8wFnAzKX5uyW2K3WD52v0gnLCTK/VLpXtKckgWuyScYK6cSPaw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true + }, + "node_modules/@types/mime": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "24.1.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz", + "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==", + "dev": true, + "dependencies": { + "undici-types": "~7.8.0" + } + }, + "node_modules/@types/qs": { + "version": "6.15.1", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.15.1.tgz", + "integrity": "sha512-GZHUBZR9hckSUhrxmp1nG6NwdpM9fCunJwyThLW1X3AyHgd9IlHb6VANpQQqDr2o/qQp6McZ3y/IA2rVzKzSbw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/range-parser": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/retry": { + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz", + "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/send": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz", + "integrity": "sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/serve-index": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz", + "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "*" + } + }, + "node_modules/@types/serve-static": { + "version": "1.15.10", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.10.tgz", + "integrity": "sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/http-errors": "*", + "@types/node": "*", + "@types/send": "<1" + } + }, + "node_modules/@types/serve-static/node_modules/@types/send": { + "version": "0.17.6", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.6.tgz", + "integrity": "sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, + "node_modules/@types/sockjs": { + "version": "0.3.36", + "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz", + "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==", "dev": true, + "license": "MIT", "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" + "@types/node": "*" } }, - "node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "dev": true - }, - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true - }, - "node_modules/@types/node": { - "version": "24.1.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz", - "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==", + "node_modules/@types/ws": { + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", "dev": true, + "license": "MIT", "dependencies": { - "undici-types": "~7.8.0" + "@types/node": "*" } }, "node_modules/@webassemblyjs/ast": { @@ -575,6 +1371,19 @@ "ajv": "^8.8.2" } }, + "node_modules/ansi-html-community": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", + "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", + "dev": true, + "engines": [ + "node >= 0.8.0" + ], + "license": "Apache-2.0", + "bin": { + "ansi-html": "bin/ansi-html" + } + }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -618,6 +1427,28 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/asn1js": { + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.10.tgz", + "integrity": "sha512-S2s3aOytiKdFRdulw2qPE51MzjzVOisppcVv7jVFR+Kw0kxwvFrDcYA0h7Ndqbmj0HkMIXYWaoj7fli8kgx1eg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "pvtsutils": "^1.3.6", + "pvutils": "^1.1.5", + "tslib": "^2.8.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -633,6 +1464,13 @@ "node": "^4.5.0 || >= 5.9" } }, + "node_modules/batch": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", + "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", + "dev": true, + "license": "MIT" + }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -646,29 +1484,72 @@ } }, "node_modules/body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "version": "1.20.6", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.6.tgz", + "integrity": "sha512-p5tAzS57i5MV9fZFDj9LeIiTZEufbSe2eDozP+ElheSUq1m74CRq1jI4mYNDdVs9vQztXFLuk/Gd6BWTdwRJ5g==", "dev": true, + "license": "MIT", "dependencies": { - "bytes": "3.1.2", + "bytes": "~3.1.2", "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", + "destroy": "~1.2.0", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "on-finished": "~2.4.1", + "qs": "~6.15.1", + "raw-body": "~2.5.3", "type-is": "~1.6.18", - "unpipe": "1.0.0" + "unpipe": "~1.0.0" }, "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/body-parser/node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/body-parser/node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/bonjour-service": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.4.3.tgz", + "integrity": "sha512-2Kd5UYlFUVgAKMTyuBLl6w49wqfOnbxHqmuH0oCl/n7TfAikR0zoowNOP5BU4dfXmm+Vr9JyEN370auSMx+CNg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "multicast-dns": "^7.2.5" + } + }, "node_modules/brace-expansion": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", @@ -736,6 +1617,22 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "node_modules/bundle-name": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz", + "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "run-applescript": "^7.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -745,6 +1642,16 @@ "node": ">= 0.8" } }, + "node_modules/bytestreamjs": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/bytestreamjs/-/bytestreamjs-2.0.1.tgz", + "integrity": "sha512-U1Z/ob71V/bXfVABvNr/Kumf5VyeQRBEm6Txb0PQ6S7V5GpBM3w4Cbqz/xPDicR5tN0uvDifng8C+5qECeGwyQ==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/call-bind-apply-helpers": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", @@ -1078,6 +1985,48 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, + "node_modules/compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": ">= 1.43.0 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/compression": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz", + "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "compressible": "~2.0.18", + "debug": "2.6.9", + "negotiator": "~0.6.4", + "on-headers": "~1.1.0", + "safe-buffer": "5.2.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/compression/node_modules/negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1099,6 +2048,29 @@ "node": ">= 0.10.0" } }, + "node_modules/connect-history-api-fallback": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", + "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/content-type": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", @@ -1117,6 +2089,20 @@ "node": ">= 0.6" } }, + "node_modules/cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", + "dev": true, + "license": "MIT" + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true, + "license": "MIT" + }, "node_modules/cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", @@ -1203,6 +2189,49 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/default-browser": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.5.0.tgz", + "integrity": "sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "bundle-name": "^4.1.0", + "default-browser-id": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser-id": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.1.tgz", + "integrity": "sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/define-lazy-prop": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", + "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -1222,6 +2251,13 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/detect-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", + "dev": true, + "license": "MIT" + }, "node_modules/di": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", @@ -1237,6 +2273,19 @@ "node": ">=0.3.1" } }, + "node_modules/dns-packet": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", + "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@leichtgewicht/ip-codec": "^2.0.1" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/dom-serialize": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", @@ -1494,6 +2543,16 @@ "node": ">=4.0" } }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -1509,6 +2568,92 @@ "node": ">=0.8.x" } }, + "node_modules/express": { + "version": "4.22.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.2.tgz", + "integrity": "sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "~1.20.5", + "content-disposition": "~0.5.4", + "content-type": "~1.0.4", + "cookie": "~0.7.1", + "cookie-signature": "~1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.3.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.0", + "merge-descriptors": "1.0.3", + "methods": "~1.1.2", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "~0.1.12", + "proxy-addr": "~2.0.7", + "qs": "~6.15.1", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "~0.19.0", + "serve-static": "~1.16.2", + "setprototypeof": "1.2.0", + "statuses": "~2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express/node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/finalhandler": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", + "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "on-finished": "~2.4.1", + "parseurl": "~1.3.3", + "statuses": "~2.0.2", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/express/node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -1546,6 +2691,19 @@ "node": ">= 4.9.1" } }, + "node_modules/faye-websocket": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "websocket-driver": ">=0.5.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -1661,6 +2819,26 @@ "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==", "dev": true }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -1783,6 +2961,23 @@ "node": ">= 6" } }, + "node_modules/glob-to-regex.js": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/glob-to-regex.js/-/glob-to-regex.js-1.2.0.tgz", + "integrity": "sha512-QMwlOQKU/IzqMUOAZWubUOT8Qft+Y0KQWnX9nK3ch0CJg0tTp4TvGZsTfudYKv2NzoQSyPcnA6TYeIQ3jGichQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, "node_modules/glob-to-regexp": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", @@ -1807,6 +3002,13 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, + "node_modules/handle-thing": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", + "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", + "dev": true, + "license": "MIT" + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1864,6 +3066,59 @@ "he": "bin/he" } }, + "node_modules/hpack.js": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", + "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" + } + }, + "node_modules/hpack.js/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dev": true, + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/hpack.js/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "license": "MIT" + }, + "node_modules/hpack.js/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/http-deceiver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", + "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", + "dev": true, + "license": "MIT" + }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -1889,6 +3144,13 @@ "node": ">= 0.8" } }, + "node_modules/http-parser-js": { + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz", + "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==", + "dev": true, + "license": "MIT" + }, "node_modules/http-proxy": { "version": "1.18.1", "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", @@ -1903,11 +3165,60 @@ "node": ">=8.0.0" } }, + "node_modules/http-proxy-middleware": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.10.tgz", + "integrity": "sha512-RKzRWNPxUZqbuk3BC5mGVJbBnWgr+diEnjJexIOytFbBzDy88Fbh/YvBr3DsNrl1jYAfjWfpATEv0NO35FDuPQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/http-proxy": "^1.17.8", + "http-proxy": "^1.18.1", + "is-glob": "^4.0.1", + "is-plain-obj": "^3.0.0", + "micromatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "@types/express": "^4.17.13" + }, + "peerDependenciesMeta": { + "@types/express": { + "optional": true + } + } + }, + "node_modules/http-proxy-middleware/node_modules/is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/hyperdyperid": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz", + "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.18" + } + }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -1976,6 +3287,16 @@ "node": ">=10.13.0" } }, + "node_modules/ipaddr.js": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.4.0.tgz", + "integrity": "sha512-9VGk3HGanVE6JoZXHiCpnGy5X0jYDnN4EA4lntFPj+1vIWlFhIylq2CrrCOJH9EAhc5CYhq18F2Av2tgoAPsYQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -2003,6 +3324,22 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-docker": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", + "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", + "dev": true, + "license": "MIT", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -2033,6 +3370,38 @@ "node": ">=0.10.0" } }, + "node_modules/is-inside-container": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", + "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-docker": "^3.0.0" + }, + "bin": { + "is-inside-container": "cli.js" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-network-error": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.3.2.tgz", + "integrity": "sha512-PhBY86zaxNZUuWP6h13Vu5oFe0XY6/UlKzQnYFELzGVHygP3MxmvTfYSG7GN3aIab/iWudSMgjSnG9Dq+nHrgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -2103,6 +3472,29 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-wsl": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.1.tgz", + "integrity": "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-inside-container": "^1.0.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true, + "license": "MIT" + }, "node_modules/isbinaryfile": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz", @@ -2321,6 +3713,17 @@ "format-util": "^1.0.5" } }, + "node_modules/launch-editor": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.14.1.tgz", + "integrity": "sha512-QWBrQsMpH7gPr965dsKD/3cKWiNoTjpATQf++Xq63N6sKRGMwlVXz41O1IZTMfZQgBctD/K5Zt06+/I6pP6+HA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picocolors": "^1.1.1", + "shell-quote": "^1.8.4" + } + }, "node_modules/loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -2430,12 +3833,76 @@ "node": ">= 0.6" } }, + "node_modules/memfs": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.64.0.tgz", + "integrity": "sha512-Kw72fgY7Wn+sD8KmtNWSafl1dz0UvAsE/PHs3YVfLiaZuA3HxNm9sRLqAu0ATiBGJvME1PxZXbBZPv5GycDeAw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jsonjoy.com/fs-core": "4.64.0", + "@jsonjoy.com/fs-fsa": "4.64.0", + "@jsonjoy.com/fs-node": "4.64.0", + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "@jsonjoy.com/fs-node-to-fsa": "4.64.0", + "@jsonjoy.com/fs-node-utils": "4.64.0", + "@jsonjoy.com/fs-print": "4.64.0", + "@jsonjoy.com/fs-snapshot": "4.64.0", + "@jsonjoy.com/json-pack": "^1.11.0", + "@jsonjoy.com/util": "^1.9.0", + "glob-to-regex.js": "^1.0.1", + "thingies": "^2.5.0", + "tree-dump": "^1.0.3", + "tslib": "^2.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, "node_modules/mime": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", @@ -2469,6 +3936,13 @@ "node": ">= 0.6" } }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true, + "license": "ISC" + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -2681,6 +4155,20 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, + "node_modules/multicast-dns": { + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", + "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", + "dev": true, + "license": "MIT", + "dependencies": { + "dns-packet": "^5.2.2", + "thunky": "^1.0.2" + }, + "bin": { + "multicast-dns": "cli.js" + } + }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -2725,6 +4213,7 @@ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2732,6 +4221,13 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/obuf": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", + "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", + "dev": true, + "license": "MIT" + }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", @@ -2744,6 +4240,16 @@ "node": ">= 0.8" } }, + "node_modules/on-headers": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz", + "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -2753,6 +4259,25 @@ "wrappy": "1" } }, + "node_modules/open": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz", + "integrity": "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "default-browser": "^5.2.1", + "define-lazy-prop": "^3.0.0", + "is-inside-container": "^1.0.0", + "wsl-utils": "^0.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -2783,6 +4308,24 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/p-retry": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz", + "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/retry": "0.12.2", + "is-network-error": "^1.0.0", + "retry": "^0.13.1" + }, + "engines": { + "node": ">=16.17" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -2856,6 +4399,13 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/path-to-regexp": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", + "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", + "dev": true, + "license": "MIT" + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -2938,12 +4488,81 @@ "node": ">=8" } }, + "node_modules/pkijs": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/pkijs/-/pkijs-3.4.0.tgz", + "integrity": "sha512-emEcLuomt2j03vxD54giVB4SxTjnsqkU692xZOZXHDVoYyypEm+b3jpiTcc+Cf+myooc+/Ly0z01jqeNHVgJGw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@noble/hashes": "1.4.0", + "asn1js": "^3.0.6", + "bytestreamjs": "^2.0.1", + "pvtsutils": "^1.3.6", + "pvutils": "^1.1.3", + "tslib": "^2.8.1" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true, + "license": "MIT" + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dev": true, + "license": "MIT", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/proxy-addr/node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, "node_modules/punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", "dev": true }, + "node_modules/pvtsutils": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.6.tgz", + "integrity": "sha512-PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^2.8.1" + } + }, + "node_modules/pvutils": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.1.5.tgz", + "integrity": "sha512-KTqnxsgGiQ6ZAzZCVlJH5eOjSnvlyEgx1m8bkRJfOhmGRqfo5KLvmAlACQkrjEtOQ4B7wF9TdSLIs9O90MX9xA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/qjobs": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz", @@ -2954,12 +4573,14 @@ } }, "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "version": "6.15.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz", + "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.6" + "es-define-property": "^1.0.1", + "side-channel": "^1.1.1" }, "engines": { "node": ">=0.6" @@ -2983,22 +4604,69 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true, "engines": { - "node": ">= 0.6" + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", + "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/raw-body/node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/raw-body/node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" } }, - "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, + "license": "MIT", "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" }, "engines": { - "node": ">= 0.8" + "node": ">= 6" } }, "node_modules/readdirp": { @@ -3025,6 +4693,13 @@ "node": ">= 10.13.0" } }, + "node_modules/reflect-metadata": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", + "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", + "dev": true, + "license": "Apache-2.0" + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -3090,6 +4765,16 @@ "node": ">=8" } }, + "node_modules/retry": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", @@ -3112,6 +4797,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/run-applescript": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.1.0.tgz", + "integrity": "sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -3174,6 +4872,113 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/select-hose": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", + "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", + "dev": true, + "license": "MIT" + }, + "node_modules/selfsigned": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-5.5.0.tgz", + "integrity": "sha512-ftnu3TW4+3eBfLRFnDEkzGxSF/10BJBkaLJuBHZX0kiPS7bRdlpZGu6YGt4KngMkdTwJE6MbjavFpqHvqVt+Ew==", + "dev": true, + "license": "MIT", + "dependencies": { + "@peculiar/x509": "^1.14.2", + "pkijs": "^3.3.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/send": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", + "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.1", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "~2.4.1", + "range-parser": "~1.2.1", + "statuses": "~2.0.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/send/node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/send/node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "license": "MIT", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/send/node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/serialize-javascript": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", @@ -3183,6 +4988,82 @@ "randombytes": "^2.1.0" } }, + "node_modules/serve-index": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.2.tgz", + "integrity": "sha512-KDj11HScOaLmrPxl70KYNW1PksP4Nb/CLL2yvC+Qd2kHMPEEpfc4Re2e4FOay+bC/+XQl/7zAcWON3JVo5v3KQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "accepts": "~1.3.8", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "~1.0.3", + "http-errors": "~1.8.0", + "mime-types": "~2.1.35", + "parseurl": "~1.3.3" + }, + "engines": { + "node": ">= 0.8.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/serve-index/node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/serve-index/node_modules/http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/serve-static": { + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", + "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "encodeurl": "~2.0.0", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "~0.19.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/serve-static/node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -3222,15 +5103,29 @@ "node": ">=8" } }, + "node_modules/shell-quote": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.10.0.tgz", + "integrity": "sha512-w1aiOKwKuRgtwAReIIj89puqg+I7GvX4IbLrvmhXbzQsj1+Zwi4VO3+fa6ZF91TWSjIxoEkKnMeHcLEODK5ZXA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz", + "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==", "dev": true, + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", + "object-inspect": "^1.13.4", + "side-channel-list": "^1.0.1", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" }, @@ -3242,13 +5137,14 @@ } }, "node_modules/side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz", + "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==", "dev": true, + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" + "object-inspect": "^1.13.4" }, "engines": { "node": ">= 0.4" @@ -3262,6 +5158,7 @@ "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", "dev": true, + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -3280,6 +5177,7 @@ "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", "dev": true, + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -3307,7 +5205,7 @@ } }, "node_modules/skiko-js": { - "resolved": "packages_imported/skiko-js/0.148.2", + "resolved": "packages_imported/skiko-js/0.150.1", "link": true }, "node_modules/socket.io": { @@ -3420,6 +5318,18 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, + "node_modules/sockjs": { + "version": "0.3.24", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", + "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "faye-websocket": "^0.11.3", + "uuid": "^8.3.2", + "websocket-driver": "^0.7.4" + } + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -3480,6 +5390,88 @@ "source-map": "^0.6.0" } }, + "node_modules/spdy": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", + "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/spdy-transport": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", + "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" + } + }, + "node_modules/spdy-transport/node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/spdy-transport/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/spdy/node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/spdy/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -3526,6 +5518,16 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -3680,6 +5682,30 @@ } } }, + "node_modules/thingies": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/thingies/-/thingies-2.6.0.tgz", + "integrity": "sha512-rMHRjmlFLM1R96UYPvpmnc3LYtdFrT33JIB7L9hetGue1qAPfn1N2LJeEjxUSidu1Iku+haLZXDuEXUHNGO/lg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "^2" + } + }, + "node_modules/thunky": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", + "dev": true, + "license": "MIT" + }, "node_modules/tmp": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", @@ -3710,6 +5736,51 @@ "node": ">=0.6" } }, + "node_modules/tree-dump": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.1.0.tgz", + "integrity": "sha512-rMuvhU4MCDbcbnleZTFezWsaZXRFemSqAM+7jPnzUl1fo9w3YEKOxAeui0fz3OI4EU4hf23iyA7uQRVko+UaBA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/streamich" + }, + "peerDependencies": { + "tslib": "2" + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD", + "peer": true + }, + "node_modules/tsyringe": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/tsyringe/-/tsyringe-4.10.0.tgz", + "integrity": "sha512-axr3IdNuVIxnaK5XGEUFTu3YmAQ6lllgrvqfEoR16g/HGnYY/6We4oWENtAnzK6/LpJ2ur9PAb80RBt7/U4ugw==", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^1.9.3" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/tsyringe/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", @@ -3803,6 +5874,13 @@ "browserslist": ">= 4.21.0" } }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" + }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -3812,6 +5890,17 @@ "node": ">= 0.4.0" } }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "dev": true, + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -3843,6 +5932,16 @@ "node": ">=10.13.0" } }, + "node_modules/wbuf": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", + "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "minimalistic-assert": "^1.0.0" + } + }, "node_modules/webpack": { "version": "5.101.3", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.3.tgz", @@ -3959,6 +6058,143 @@ "node": ">=18.0.0" } }, + "node_modules/webpack-dev-middleware": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.5.tgz", + "integrity": "sha512-uxQ6YqGdE4hgDKNf7hUiPXOdtkXvBJXrfEGYSx7P7LC8hnUYGK70X6xQXUvXeNyBDDcsiQXpG2m3G9vxowaEuA==", + "dev": true, + "license": "MIT", + "dependencies": { + "colorette": "^2.0.10", + "memfs": "^4.43.1", + "mime-types": "^3.0.1", + "on-finished": "^2.4.1", + "range-parser": "^1.2.1", + "schema-utils": "^4.0.0" + }, + "engines": { + "node": ">= 18.12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "webpack": { + "optional": true + } + } + }, + "node_modules/webpack-dev-middleware/node_modules/mime-db": { + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", + "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/webpack-dev-middleware/node_modules/mime-types": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.2.tgz", + "integrity": "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "^1.54.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/webpack-dev-server": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.3.tgz", + "integrity": "sha512-9Gyu2F7+bg4Vv+pjbovuYDhHX+mqdqITykfzdM9UyKqKHlsE5aAjRhR+oOEfXW5vBeu8tarzlJFIZva4ZjAdrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/bonjour": "^3.5.13", + "@types/connect-history-api-fallback": "^1.5.4", + "@types/express": "^4.17.25", + "@types/express-serve-static-core": "^4.17.21", + "@types/serve-index": "^1.9.4", + "@types/serve-static": "^1.15.5", + "@types/sockjs": "^0.3.36", + "@types/ws": "^8.5.10", + "ansi-html-community": "^0.0.8", + "bonjour-service": "^1.2.1", + "chokidar": "^3.6.0", + "colorette": "^2.0.10", + "compression": "^1.8.1", + "connect-history-api-fallback": "^2.0.0", + "express": "^4.22.1", + "graceful-fs": "^4.2.6", + "http-proxy-middleware": "^2.0.9", + "ipaddr.js": "^2.1.0", + "launch-editor": "^2.6.1", + "open": "^10.0.3", + "p-retry": "^6.2.0", + "schema-utils": "^4.2.0", + "selfsigned": "^5.5.0", + "serve-index": "^1.9.1", + "sockjs": "^0.3.24", + "spdy": "^4.0.2", + "webpack-dev-middleware": "^7.4.2", + "ws": "^8.18.0" + }, + "bin": { + "webpack-dev-server": "bin/webpack-dev-server.js" + }, + "engines": { + "node": ">= 18.12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "webpack": { + "optional": true + }, + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/webpack-dev-server/node_modules/ws": { + "version": "8.21.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz", + "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/webpack-merge": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", @@ -3977,6 +6213,31 @@ "node": ">=10.13.0" } }, + "node_modules/websocket-driver": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.5.tgz", + "integrity": "sha512-ZL2+3c7kMBdIRCMz6l8jQMHyGVxj+UL+xVk74Ombiciboca8rHa15L86B19E5oh1pL9Ii/uj54gtsIrZGMo6zA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/websocket-extensions": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", @@ -4063,6 +6324,22 @@ } } }, + "node_modules/wsl-utils": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.1.0.tgz", + "integrity": "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-wsl": "^3.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -4180,6 +6457,12 @@ "packages_imported/skiko-js/0.148.2": { "name": "skiko-js", "version": "0.148.2", + "extraneous": true, + "devDependencies": {} + }, + "packages_imported/skiko-js/0.150.1": { + "name": "skiko-js", + "version": "0.150.1", "devDependencies": {} }, "packages_imported/skiko-js/0.9.22-2": { @@ -4226,7 +6509,13 @@ }, "packages/circuit-backstack": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-backstack-test": { "version": "0.0.0-unspecified", @@ -4245,7 +6534,13 @@ }, "packages/circuit-codegen-annotations": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-codegen-annotations-test": { "version": "0.0.0-unspecified", @@ -4264,7 +6559,13 @@ }, "packages/circuit-foundation": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-foundation-test": { "version": "0.0.0-unspecified", @@ -4272,7 +6573,13 @@ }, "packages/circuit-overlay": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-overlay-test": { "version": "0.0.0-unspecified", @@ -4291,7 +6598,13 @@ }, "packages/circuit-retained": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-retained-test": { "version": "0.0.0-unspecified", @@ -4310,11 +6623,23 @@ }, "packages/circuit-runtime": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-runtime-navigation": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-runtime-navigation-test": { "version": "0.0.0-unspecified", @@ -4333,7 +6658,13 @@ }, "packages/circuit-runtime-presenter": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-runtime-presenter-test": { "version": "0.0.0-unspecified", @@ -4352,7 +6683,13 @@ }, "packages/circuit-runtime-screen": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-runtime-screen-test": { "version": "0.0.0-unspecified", @@ -4386,7 +6723,13 @@ }, "packages/circuit-runtime-ui": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-runtime-ui-test": { "version": "0.0.0-unspecified", @@ -4405,7 +6748,13 @@ }, "packages/circuit-serialization": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-serialization-test": { "version": "0.0.0-unspecified", @@ -4424,7 +6773,13 @@ }, "packages/circuit-sharedelements": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-sharedelements-test": { "version": "0.0.0-unspecified", @@ -4443,7 +6798,13 @@ }, "packages/circuit-test": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuit-test-test": { "version": "0.0.0-unspecified", @@ -4462,7 +6823,13 @@ }, "packages/circuitx-effects": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuitx-effects-test": { "version": "0.0.0-unspecified", @@ -4481,7 +6848,13 @@ }, "packages/circuitx-gesture-navigation": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuitx-gesture-navigation-test": { "version": "0.0.0-unspecified", @@ -4489,7 +6862,13 @@ }, "packages/circuitx-navigation": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuitx-navigation-test": { "version": "0.0.0-unspecified", @@ -4511,7 +6890,13 @@ "dependencies": { "@js-joda/core": "3.2.0" }, - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuitx-overlays-test": { "version": "0.0.0-unspecified", @@ -4533,11 +6918,23 @@ }, "packages/circuitx-subcircuit": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuitx-subcircuit-codegen-annotations": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuitx-subcircuit-codegen-annotations-test": { "version": "0.0.0-unspecified", @@ -4556,7 +6953,13 @@ }, "packages/circuitx-subcircuit-test": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/circuitx-subcircuit-test-test": { "version": "0.0.0-unspecified", @@ -4578,7 +6981,13 @@ "dependencies": { "@js-joda/core": "3.2.0" }, - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/counterbrowser-test": { "version": "1.0.0-SNAPSHOT", @@ -4600,7 +7009,13 @@ }, "packages/internal-runtime": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/internal-runtime-test": { "version": "0.0.0-unspecified", @@ -4619,7 +7034,13 @@ }, "packages/internal-test-utils": { "version": "0.0.0-unspecified", - "devDependencies": {} + "devDependencies": { + "kotlin-web-helpers": "3.0.0", + "source-map-loader": "5.0.0", + "webpack": "5.101.3", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.3" + } }, "packages/internal-test-utils-test": { "version": "0.0.0-unspecified", diff --git a/kotlin-js-store/wasm/package-lock.json b/kotlin-js-store/wasm/package-lock.json index 77f58504f3..496c74d5a2 100644 --- a/kotlin-js-store/wasm/package-lock.json +++ b/kotlin-js-store/wasm/package-lock.json @@ -56,8 +56,8 @@ "packages/counterbrowser-test", "packages/counterApp", "packages/counterApp-test", - "packages_imported/skiko-wasm-js/0.148.2", - "packages_imported/skiko-js-wasm-runtime/0.148.2", + "packages_imported/skiko-wasm-js/0.150.1", + "packages_imported/skiko-js-wasm-runtime/0.150.1", "packages_imported/Kotlin-DateTime-library-kotlinx-datetime-wasm-js/0.7.1" ], "devDependencies": {} @@ -260,11 +260,11 @@ "link": true }, "node_modules/skiko-js-wasm-runtime": { - "resolved": "packages_imported/skiko-js-wasm-runtime/0.148.2", + "resolved": "packages_imported/skiko-js-wasm-runtime/0.150.1", "link": true }, "node_modules/skiko-wasm-js": { - "resolved": "packages_imported/skiko-wasm-js/0.148.2", + "resolved": "packages_imported/skiko-wasm-js/0.150.1", "link": true }, "packages_imported/Kotlin-DateTime-library-kotlinx-datetime-wasm-js/0.6.0": { @@ -312,6 +312,12 @@ "packages_imported/skiko-js-wasm-runtime/0.148.2": { "name": "skiko-js-wasm-runtime", "version": "0.148.2", + "extraneous": true, + "devDependencies": {} + }, + "packages_imported/skiko-js-wasm-runtime/0.150.1": { + "name": "skiko-js-wasm-runtime", + "version": "0.150.1", "devDependencies": {} }, "packages_imported/skiko-js-wasm-runtime/0.9.22": { @@ -389,6 +395,12 @@ "packages_imported/skiko-wasm-js/0.148.2": { "name": "skiko-wasm-js", "version": "0.148.2", + "extraneous": true, + "devDependencies": {} + }, + "packages_imported/skiko-wasm-js/0.150.1": { + "name": "skiko-wasm-js", + "version": "0.150.1", "devDependencies": {} }, "packages_imported/skiko-wasm-js/0.9.22": { diff --git a/samples/counter/build.gradle.kts b/samples/counter/build.gradle.kts index fb282f6646..f932ec8bec 100644 --- a/samples/counter/build.gradle.kts +++ b/samples/counter/build.gradle.kts @@ -23,11 +23,13 @@ kotlin { js { outputModuleName = "counterbrowser" browser() + binaries.executable() } @OptIn(ExperimentalWasmDsl::class) wasmJs { outputModuleName = "counterbrowser" browser() + binaries.executable() } listOf(iosArm64(), iosSimulatorArm64()).forEach { it.binaries.framework { baseName = "CounterKt" } From 4af6ba80b1838cd722a36ba643ef39c840581ddb Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Thu, 16 Jul 2026 16:21:20 -0700 Subject: [PATCH 11/14] Re-baseline dependencyGuard for Compose 1.12 Compose 1.12 restructured its Android publishing, so androidRuntimeClasspath swaps androidx.navigationevent:* for org.jetbrains.compose.{ui,runtime, foundation,animation}:*-android. Re-baseline the affected modules. Co-Authored-By: Claude --- backstack/dependencies/androidRuntimeClasspath.txt | 10 ++++++++-- .../dependencies/androidRuntimeClasspath.txt | 12 ++++++++++++ .../dependencies/androidRuntimeClasspath.txt | 14 ++++++++++++-- .../dependencies/androidRuntimeClasspath.txt | 2 ++ .../dependencies/androidRuntimeClasspath.txt | 10 ++++++++-- .../dependencies/androidRuntimeClasspath.txt | 14 ++++++++++++-- .../dependencies/androidRuntimeClasspath.txt | 12 ++++++++++++ .../dependencies/androidRuntimeClasspath.txt | 10 ++++++++-- .../dependencies/androidRuntimeClasspath.txt | 12 ++++++++++++ .../dependencies/androidRuntimeClasspath.txt | 12 ++++++++++++ .../dependencies/androidRuntimeClasspath.txt | 12 ++++++++++++ .../dependencies/androidRuntimeClasspath.txt | 14 ++++++++++++-- .../dependencies/androidRuntimeClasspath.txt | 14 ++++++++++++-- 13 files changed, 134 insertions(+), 14 deletions(-) diff --git a/backstack/dependencies/androidRuntimeClasspath.txt b/backstack/dependencies/androidRuntimeClasspath.txt index 6af4060230..413bb6ad15 100644 --- a/backstack/dependencies/androidRuntimeClasspath.txt +++ b/backstack/dependencies/androidRuntimeClasspath.txt @@ -52,8 +52,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.navigationevent:navigationevent-android -androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -72,12 +70,20 @@ org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuit-foundation/dependencies/androidRuntimeClasspath.txt b/circuit-foundation/dependencies/androidRuntimeClasspath.txt index 4598c7789b..ba0f124a02 100644 --- a/circuit-foundation/dependencies/androidRuntimeClasspath.txt +++ b/circuit-foundation/dependencies/androidRuntimeClasspath.txt @@ -95,16 +95,28 @@ org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.animation:animation-android +org.jetbrains.compose.animation:animation-core-android org.jetbrains.compose.animation:animation-core org.jetbrains.compose.animation:animation +org.jetbrains.compose.foundation:foundation-android +org.jetbrains.compose.foundation:foundation-layout-android org.jetbrains.compose.foundation:foundation-layout org.jetbrains.compose.foundation:foundation +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuit-overlay/dependencies/androidRuntimeClasspath.txt b/circuit-overlay/dependencies/androidRuntimeClasspath.txt index 88f0a2468b..9af97da274 100644 --- a/circuit-overlay/dependencies/androidRuntimeClasspath.txt +++ b/circuit-overlay/dependencies/androidRuntimeClasspath.txt @@ -60,8 +60,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.navigationevent:navigationevent-android -androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -80,16 +78,28 @@ org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.animation:animation-android +org.jetbrains.compose.animation:animation-core-android org.jetbrains.compose.animation:animation-core org.jetbrains.compose.animation:animation +org.jetbrains.compose.foundation:foundation-android +org.jetbrains.compose.foundation:foundation-layout-android org.jetbrains.compose.foundation:foundation-layout org.jetbrains.compose.foundation:foundation +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuit-retained/dependencies/androidRuntimeClasspath.txt b/circuit-retained/dependencies/androidRuntimeClasspath.txt index fc39bd3841..6c0cd3edca 100644 --- a/circuit-retained/dependencies/androidRuntimeClasspath.txt +++ b/circuit-retained/dependencies/androidRuntimeClasspath.txt @@ -90,6 +90,8 @@ org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime org.jetbrains.kotlin:kotlin-bom diff --git a/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt b/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt index e755b85ada..f82291d3a5 100644 --- a/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt +++ b/circuit-runtime-ui/dependencies/androidRuntimeClasspath.txt @@ -52,8 +52,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.navigationevent:navigationevent-android -androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -72,12 +70,20 @@ org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt b/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt index 88f0a2468b..9af97da274 100644 --- a/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt +++ b/circuit-shared-elements/dependencies/androidRuntimeClasspath.txt @@ -60,8 +60,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.navigationevent:navigationevent-android -androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -80,16 +78,28 @@ org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.animation:animation-android +org.jetbrains.compose.animation:animation-core-android org.jetbrains.compose.animation:animation-core org.jetbrains.compose.animation:animation +org.jetbrains.compose.foundation:foundation-android +org.jetbrains.compose.foundation:foundation-layout-android org.jetbrains.compose.foundation:foundation-layout org.jetbrains.compose.foundation:foundation +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuit-test/dependencies/androidRuntimeClasspath.txt b/circuit-test/dependencies/androidRuntimeClasspath.txt index a81a377c7c..b9defbac5c 100644 --- a/circuit-test/dependencies/androidRuntimeClasspath.txt +++ b/circuit-test/dependencies/androidRuntimeClasspath.txt @@ -99,16 +99,28 @@ org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.animation:animation-android +org.jetbrains.compose.animation:animation-core-android org.jetbrains.compose.animation:animation-core org.jetbrains.compose.animation:animation +org.jetbrains.compose.foundation:foundation-android +org.jetbrains.compose.foundation:foundation-layout-android org.jetbrains.compose.foundation:foundation-layout org.jetbrains.compose.foundation:foundation +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuitx/effects/dependencies/androidRuntimeClasspath.txt b/circuitx/effects/dependencies/androidRuntimeClasspath.txt index 14d5385687..845e8c4c70 100644 --- a/circuitx/effects/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/effects/dependencies/androidRuntimeClasspath.txt @@ -54,8 +54,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.navigationevent:navigationevent-android -androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -83,12 +81,20 @@ org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuitx/gesture-navigation/dependencies/androidRuntimeClasspath.txt b/circuitx/gesture-navigation/dependencies/androidRuntimeClasspath.txt index a0fbf34015..badc687387 100644 --- a/circuitx/gesture-navigation/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/gesture-navigation/dependencies/androidRuntimeClasspath.txt @@ -100,22 +100,34 @@ org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.animation:animation-android +org.jetbrains.compose.animation:animation-core-android org.jetbrains.compose.animation:animation-core org.jetbrains.compose.animation:animation org.jetbrains.compose.annotation-internal:annotation org.jetbrains.compose.collection-internal:collection +org.jetbrains.compose.foundation:foundation-android +org.jetbrains.compose.foundation:foundation-layout-android org.jetbrains.compose.foundation:foundation-layout org.jetbrains.compose.foundation:foundation org.jetbrains.compose.material3:material3 org.jetbrains.compose.material:material-ripple +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android org.jetbrains.compose.ui:ui-backhandler-android org.jetbrains.compose.ui:ui-backhandler +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuitx/navigation/dependencies/androidRuntimeClasspath.txt b/circuitx/navigation/dependencies/androidRuntimeClasspath.txt index 4598c7789b..ba0f124a02 100644 --- a/circuitx/navigation/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/navigation/dependencies/androidRuntimeClasspath.txt @@ -95,16 +95,28 @@ org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.animation:animation-android +org.jetbrains.compose.animation:animation-core-android org.jetbrains.compose.animation:animation-core org.jetbrains.compose.animation:animation +org.jetbrains.compose.foundation:foundation-android +org.jetbrains.compose.foundation:foundation-layout-android org.jetbrains.compose.foundation:foundation-layout org.jetbrains.compose.foundation:foundation +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuitx/overlays/dependencies/androidRuntimeClasspath.txt b/circuitx/overlays/dependencies/androidRuntimeClasspath.txt index a0fbf34015..badc687387 100644 --- a/circuitx/overlays/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/overlays/dependencies/androidRuntimeClasspath.txt @@ -100,22 +100,34 @@ org.jetbrains.androidx.lifecycle:lifecycle-viewmodel org.jetbrains.androidx.navigationevent:navigationevent-compose org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.animation:animation-android +org.jetbrains.compose.animation:animation-core-android org.jetbrains.compose.animation:animation-core org.jetbrains.compose.animation:animation org.jetbrains.compose.annotation-internal:annotation org.jetbrains.compose.collection-internal:collection +org.jetbrains.compose.foundation:foundation-android +org.jetbrains.compose.foundation:foundation-layout-android org.jetbrains.compose.foundation:foundation-layout org.jetbrains.compose.foundation:foundation org.jetbrains.compose.material3:material3 org.jetbrains.compose.material:material-ripple +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android org.jetbrains.compose.ui:ui-backhandler-android org.jetbrains.compose.ui:ui-backhandler +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuitx/subcircuit-test/dependencies/androidRuntimeClasspath.txt b/circuitx/subcircuit-test/dependencies/androidRuntimeClasspath.txt index 48903b68d1..c08d1ea201 100644 --- a/circuitx/subcircuit-test/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/subcircuit-test/dependencies/androidRuntimeClasspath.txt @@ -60,8 +60,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.navigationevent:navigationevent-android -androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -84,16 +82,28 @@ org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.animation:animation-android +org.jetbrains.compose.animation:animation-core-android org.jetbrains.compose.animation:animation-core org.jetbrains.compose.animation:animation +org.jetbrains.compose.foundation:foundation-android +org.jetbrains.compose.foundation:foundation-layout-android org.jetbrains.compose.foundation:foundation-layout org.jetbrains.compose.foundation:foundation +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom diff --git a/circuitx/subcircuit/dependencies/androidRuntimeClasspath.txt b/circuitx/subcircuit/dependencies/androidRuntimeClasspath.txt index 88f0a2468b..9af97da274 100644 --- a/circuitx/subcircuit/dependencies/androidRuntimeClasspath.txt +++ b/circuitx/subcircuit/dependencies/androidRuntimeClasspath.txt @@ -60,8 +60,6 @@ androidx.lifecycle:lifecycle-viewmodel-ktx androidx.lifecycle:lifecycle-viewmodel-savedstate-android androidx.lifecycle:lifecycle-viewmodel-savedstate androidx.lifecycle:lifecycle-viewmodel -androidx.navigationevent:navigationevent-android -androidx.navigationevent:navigationevent androidx.profileinstaller:profileinstaller androidx.savedstate:savedstate-android androidx.savedstate:savedstate-compose-android @@ -80,16 +78,28 @@ org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose org.jetbrains.androidx.lifecycle:lifecycle-runtime org.jetbrains.androidx.savedstate:savedstate-compose org.jetbrains.androidx.savedstate:savedstate +org.jetbrains.compose.animation:animation-android +org.jetbrains.compose.animation:animation-core-android org.jetbrains.compose.animation:animation-core org.jetbrains.compose.animation:animation +org.jetbrains.compose.foundation:foundation-android +org.jetbrains.compose.foundation:foundation-layout-android org.jetbrains.compose.foundation:foundation-layout org.jetbrains.compose.foundation:foundation +org.jetbrains.compose.runtime:runtime-android +org.jetbrains.compose.runtime:runtime-saveable-android org.jetbrains.compose.runtime:runtime-saveable org.jetbrains.compose.runtime:runtime +org.jetbrains.compose.ui:ui-android +org.jetbrains.compose.ui:ui-geometry-android org.jetbrains.compose.ui:ui-geometry +org.jetbrains.compose.ui:ui-graphics-android org.jetbrains.compose.ui:ui-graphics +org.jetbrains.compose.ui:ui-text-android org.jetbrains.compose.ui:ui-text +org.jetbrains.compose.ui:ui-unit-android org.jetbrains.compose.ui:ui-unit +org.jetbrains.compose.ui:ui-util-android org.jetbrains.compose.ui:ui-util org.jetbrains.compose.ui:ui org.jetbrains.kotlin:kotlin-bom From 33404b16bb5ae695746a30e86798be41eed5b23f Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Thu, 16 Jul 2026 16:47:04 -0700 Subject: [PATCH 12/14] Format circuit.android convention plugin kempt formatting for the targetSdk manifest-rewrite block introduced by the merge. Co-Authored-By: Claude --- .../main/kotlin/circuit.android.gradle.kts | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/build-logic/src/main/kotlin/circuit.android.gradle.kts b/build-logic/src/main/kotlin/circuit.android.gradle.kts index 9c524652f6..994ebcedcf 100644 --- a/build-logic/src/main/kotlin/circuit.android.gradle.kts +++ b/build-logic/src/main/kotlin/circuit.android.gradle.kts @@ -37,21 +37,25 @@ pluginManager.withPlugin("com.android.kotlin.multiplatform.library") { } } // todo Robolectric: targetSdk on host test compilations is not getting set on the manifest?? - tasks.matching { it.name == "processAndroidHostTestManifest" }.configureEach { - val sdkVersion = targetSdkVersion - doLast { - val manifestDir = outputs.files.files.first { it.isDirectory } - val manifest = File(manifestDir, "AndroidManifest.xml") - if (manifest.exists()) { - manifest.writeText( - manifest.readText().replace( - Regex("""android:targetSdkVersion="\d+""""), - """android:targetSdkVersion="$sdkVersion"""" + tasks + .matching { it.name == "processAndroidHostTestManifest" } + .configureEach { + val sdkVersion = targetSdkVersion + doLast { + val manifestDir = outputs.files.files.first { it.isDirectory } + val manifest = File(manifestDir, "AndroidManifest.xml") + if (manifest.exists()) { + manifest.writeText( + manifest + .readText() + .replace( + Regex("""android:targetSdkVersion="\d+""""), + """android:targetSdkVersion="$sdkVersion"""", + ) ) - ) + } } } - } dependencies { add("lintChecks", catalog.findLibrary("lints-compose").get()) } } From 3ec5391cddfb8a3254e9322d513e5f266866c65a Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Tue, 28 Jul 2026 09:32:57 -0700 Subject: [PATCH 13/14] Update jb-compose to 1.12.0-beta03 Co-Authored-By: Claude --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 498d2d772c..2441cb5fbe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ dagger = "2.60.1" datastore = "1.2.1" dokka = "2.2.0" eithernet = "2.0.0" -jb-compose = "1.12.0-beta02" +jb-compose = "1.12.0-beta03" jb-compose-material-icons-core = "1.7.3" jb-compose-material3 = "1.9.0" jb-compose-navigationevent = "1.1.0" From 78c2caa4a1cb870a72e7910830c12de459dac918 Mon Sep 17 00:00:00 2001 From: Josh Stagg Date: Tue, 11 Aug 2026 09:18:47 -0700 Subject: [PATCH 14/14] 1.12.0-rc01 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 29ea772e5a..07a04b5818 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ dagger = "2.60.1" datastore = "1.2.1" dokka = "2.2.0" eithernet = "2.0.0" -jb-compose = "1.12.0-beta03" +jb-compose = "1.12.0-rc01" jb-compose-material-icons-core = "1.7.3" jb-compose-material3 = "1.9.0" jb-compose-navigationevent = "1.1.0"