resolved merge conflicts

openMF · Jan 20, 2025 · 20f6918 · 20f6918
1 parent 4a619ec
commit 20f6918
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 26 deletions.
diff --git a/androidApp/dependencies/demoDebugRuntimeClasspath.txt b/androidApp/dependencies/demoDebugRuntimeClasspath.txt
@@ -129,8 +129,6 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
 androidx.window.extensions.core:core:1.0.0
 androidx.window:window:1.2.0
-app.cash.turbine:turbine-jvm:1.1.0
-app.cash.turbine:turbine:1.1.0
 co.touchlab:kermit-android-debug:2.0.4
 co.touchlab:kermit-core-android-debug:2.0.4
 co.touchlab:kermit-core:2.0.4
@@ -288,8 +286,6 @@ io.ktor:ktor-websockets:3.0.3
 io.michaelrocks:libphonenumber-android:8.13.35
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
-net.bytebuddy:byte-buddy-agent:1.14.8
-net.bytebuddy:byte-buddy:1.14.8
 org.checkerframework:checker-qual:3.43.0
 org.jetbrains.androidx.core:core-bundle-android-debug:1.0.1
 org.jetbrains.androidx.core:core-bundle:1.0.1
@@ -339,8 +335,6 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1
 org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.1
 org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.1
-org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.10.1
-org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1
 org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
 org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
 org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.5.4
@@ -356,6 +350,4 @@ org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
 org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:23.0.0
 org.jspecify:jspecify:1.0.0
-org.mockito:mockito-core:5.6.0
-org.objenesis:objenesis:3.3
 org.slf4j:slf4j-api:2.0.16
diff --git a/androidApp/dependencies/demoReleaseRuntimeClasspath.txt b/androidApp/dependencies/demoReleaseRuntimeClasspath.txt
@@ -124,8 +124,6 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
 androidx.window.extensions.core:core:1.0.0
 androidx.window:window:1.2.0
-app.cash.turbine:turbine-jvm:1.1.0
-app.cash.turbine:turbine:1.1.0
 co.touchlab:kermit-android:2.0.4
 co.touchlab:kermit-core-android:2.0.4
 co.touchlab:kermit-core:2.0.4
@@ -283,8 +281,6 @@ io.ktor:ktor-websockets:3.0.3
 io.michaelrocks:libphonenumber-android:8.13.35
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
-net.bytebuddy:byte-buddy-agent:1.14.8
-net.bytebuddy:byte-buddy:1.14.8
 org.checkerframework:checker-qual:3.43.0
 org.jetbrains.androidx.core:core-bundle-android:1.0.1
 org.jetbrains.androidx.core:core-bundle:1.0.1
@@ -349,6 +345,4 @@ org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
 org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:23.0.0
 org.jspecify:jspecify:1.0.0
-org.mockito:mockito-core:5.6.0
-org.objenesis:objenesis:3.3
 org.slf4j:slf4j-api:2.0.16
diff --git a/androidApp/dependencies/prodDebugRuntimeClasspath.txt b/androidApp/dependencies/prodDebugRuntimeClasspath.txt
@@ -129,8 +129,6 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
 androidx.window.extensions.core:core:1.0.0
 androidx.window:window:1.2.0
-app.cash.turbine:turbine-jvm:1.1.0
-app.cash.turbine:turbine:1.1.0
 co.touchlab:kermit-android-debug:2.0.4
 co.touchlab:kermit-core-android-debug:2.0.4
 co.touchlab:kermit-core:2.0.4
@@ -288,8 +286,6 @@ io.ktor:ktor-websockets:3.0.3
 io.michaelrocks:libphonenumber-android:8.13.35
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
-net.bytebuddy:byte-buddy-agent:1.14.8
-net.bytebuddy:byte-buddy:1.14.8
 org.checkerframework:checker-qual:3.43.0
 org.jetbrains.androidx.core:core-bundle-android-debug:1.0.1
 org.jetbrains.androidx.core:core-bundle:1.0.1
@@ -354,6 +350,4 @@ org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
 org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:23.0.0
 org.jspecify:jspecify:1.0.0
-org.mockito:mockito-core:5.6.0
-org.objenesis:objenesis:3.3
 org.slf4j:slf4j-api:2.0.16
diff --git a/androidApp/dependencies/prodReleaseRuntimeClasspath.txt b/androidApp/dependencies/prodReleaseRuntimeClasspath.txt
@@ -124,8 +124,6 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
 androidx.window.extensions.core:core:1.0.0
 androidx.window:window:1.2.0
-app.cash.turbine:turbine-jvm:1.1.0
-app.cash.turbine:turbine:1.1.0
 co.touchlab:kermit-android:2.0.4
 co.touchlab:kermit-core-android:2.0.4
 co.touchlab:kermit-core:2.0.4
@@ -283,8 +281,6 @@ io.ktor:ktor-websockets:3.0.3
 io.michaelrocks:libphonenumber-android:8.13.35
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
-net.bytebuddy:byte-buddy-agent:1.14.8
-net.bytebuddy:byte-buddy:1.14.8
 org.checkerframework:checker-qual:3.43.0
 org.jetbrains.androidx.core:core-bundle-android:1.0.1
 org.jetbrains.androidx.core:core-bundle:1.0.1
@@ -349,6 +345,4 @@ org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3
 org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3
 org.jetbrains:annotations:23.0.0
 org.jspecify:jspecify:1.0.0
-org.mockito:mockito-core:5.6.0
-org.objenesis:objenesis:3.3
 org.slf4j:slf4j-api:2.0.16