Skip to content

Commit 2b17f80

Browse files
Nagarjuna0033Nagarjuna0033
committed
resolved merge conflicts
1 parent 24d62ef commit 2b17f80

File tree

4 files changed

+36
-37
lines changed

4 files changed

+36
-37
lines changed

‎androidApp/dependencies/demoDebugRuntimeClasspath.txt‎

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
129129
androidx.viewpager:viewpager:1.0.0
130130
androidx.window.extensions.core:core:1.0.0
131131
androidx.window:window:1.2.0
132-
app.cash.turbine:turbine-jvm:1.1.0
133-
app.cash.turbine:turbine:1.1.0
134132
co.touchlab:kermit-android-debug:2.0.4
135133
co.touchlab:kermit-core-android-debug:2.0.4
136134
co.touchlab:kermit-core:2.0.4
@@ -236,24 +234,40 @@ io.insert-koin:koin-core-jvm:4.0.1-RC1
236234
io.insert-koin:koin-core-viewmodel-jvm:4.0.1-RC1
237235
io.insert-koin:koin-core-viewmodel:4.0.1-RC1
238236
io.insert-koin:koin-core:4.0.1-RC1
239-
io.ktor:ktor-client-core-jvm:3.0.1
240-
io.ktor:ktor-client-core:3.0.1
241-
io.ktor:ktor-events-jvm:3.0.1
242-
io.ktor:ktor-events:3.0.1
243-
io.ktor:ktor-http-jvm:3.0.1
244-
io.ktor:ktor-http:3.0.1
245-
io.ktor:ktor-io-jvm:3.0.1
246-
io.ktor:ktor-io:3.0.1
247-
io.ktor:ktor-serialization-jvm:3.0.1
248-
io.ktor:ktor-serialization:3.0.1
249-
io.ktor:ktor-sse-jvm:3.0.1
250-
io.ktor:ktor-sse:3.0.1
251-
io.ktor:ktor-utils-jvm:3.0.1
252-
io.ktor:ktor-utils:3.0.1
253-
io.ktor:ktor-websocket-serialization-jvm:3.0.1
254-
io.ktor:ktor-websocket-serialization:3.0.1
255-
io.ktor:ktor-websockets-jvm:3.0.1
256-
io.ktor:ktor-websockets:3.0.1
237+
io.ktor:ktor-client-auth-jvm:3.0.3
238+
io.ktor:ktor-client-auth:3.0.3
239+
io.ktor:ktor-client-content-negotiation-jvm:3.0.3
240+
io.ktor:ktor-client-content-negotiation:3.0.3
241+
io.ktor:ktor-client-core-jvm:3.0.3
242+
io.ktor:ktor-client-core:3.0.3
243+
io.ktor:ktor-client-json-jvm:3.0.3
244+
io.ktor:ktor-client-json:3.0.3
245+
io.ktor:ktor-client-logging-jvm:3.0.3
246+
io.ktor:ktor-client-logging:3.0.3
247+
io.ktor:ktor-client-okhttp-jvm:3.0.3
248+
io.ktor:ktor-client-okhttp:3.0.3
249+
io.ktor:ktor-client-serialization-jvm:3.0.3
250+
io.ktor:ktor-client-serialization:3.0.3
251+
io.ktor:ktor-events-jvm:3.0.3
252+
io.ktor:ktor-events:3.0.3
253+
io.ktor:ktor-http-jvm:3.0.3
254+
io.ktor:ktor-http:3.0.3
255+
io.ktor:ktor-io-jvm:3.0.3
256+
io.ktor:ktor-io:3.0.3
257+
io.ktor:ktor-serialization-jvm:3.0.3
258+
io.ktor:ktor-serialization-kotlinx-json-jvm:3.0.3
259+
io.ktor:ktor-serialization-kotlinx-json:3.0.3
260+
io.ktor:ktor-serialization-kotlinx-jvm:3.0.3
261+
io.ktor:ktor-serialization-kotlinx:3.0.3
262+
io.ktor:ktor-serialization:3.0.3
263+
io.ktor:ktor-sse-jvm:3.0.3
264+
io.ktor:ktor-sse:3.0.3
265+
io.ktor:ktor-utils-jvm:3.0.3
266+
io.ktor:ktor-utils:3.0.3
267+
io.ktor:ktor-websocket-serialization-jvm:3.0.3
268+
io.ktor:ktor-websocket-serialization:3.0.3
269+
io.ktor:ktor-websockets-jvm:3.0.3
270+
io.ktor:ktor-websockets:3.0.3
257271
io.michaelrocks:libphonenumber-android:8.13.35
258272
jakarta.inject:jakarta.inject-api:2.0.1
259273
javax.inject:javax.inject:1

‎androidApp/dependencies/demoReleaseRuntimeClasspath.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
124124
androidx.viewpager:viewpager:1.0.0
125125
androidx.window.extensions.core:core:1.0.0
126126
androidx.window:window:1.2.0
127-
app.cash.turbine:turbine-jvm:1.1.0
128-
app.cash.turbine:turbine:1.1.0
129127
co.touchlab:kermit-android:2.0.4
130128
co.touchlab:kermit-core-android:2.0.4
131129
co.touchlab:kermit-core:2.0.4
@@ -196,14 +194,14 @@ com.squareup.okio:okio-jvm:3.9.1
196194
com.squareup.okio:okio:3.9.1
197195
com.squareup.retrofit2:converter-gson:2.11.0
198196
com.squareup.retrofit2:retrofit:2.11.0
199-
dev.chrisbanes.material3:material3-window-size-class-multiplatform-android:0.5.0
200-
dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0
201197
de.jensklingenberg.ktorfit:ktorfit-annotations-android:2.2.0
202198
de.jensklingenberg.ktorfit:ktorfit-annotations:2.2.0
203199
de.jensklingenberg.ktorfit:ktorfit-lib-android:2.2.0
204200
de.jensklingenberg.ktorfit:ktorfit-lib-light-android:2.2.0
205201
de.jensklingenberg.ktorfit:ktorfit-lib-light:2.2.0
206202
de.jensklingenberg.ktorfit:ktorfit-lib:2.2.0
203+
dev.chrisbanes.material3:material3-window-size-class-multiplatform-android:0.5.0
204+
dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0
207205
dev.chrisbanes.snapper:snapper:0.2.2
208206
io.coil-kt.coil3:coil-android:3.0.4
209207
io.coil-kt.coil3:coil-compose-core-android:3.0.4
@@ -304,7 +302,6 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
304302
org.jetbrains.compose.ui:ui:1.7.0-rc01
305303
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
306304
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
307-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
308305
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
309306
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
310307
org.jetbrains.kotlin:kotlin-stdlib:2.1.0

‎androidApp/dependencies/prodDebugRuntimeClasspath.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
129129
androidx.viewpager:viewpager:1.0.0
130130
androidx.window.extensions.core:core:1.0.0
131131
androidx.window:window:1.2.0
132-
app.cash.turbine:turbine-jvm:1.1.0
133-
app.cash.turbine:turbine:1.1.0
134132
co.touchlab:kermit-android-debug:2.0.4
135133
co.touchlab:kermit-core-android-debug:2.0.4
136134
co.touchlab:kermit-core:2.0.4
@@ -273,8 +271,6 @@ io.ktor:ktor-websockets:3.0.3
273271
io.michaelrocks:libphonenumber-android:8.13.35
274272
jakarta.inject:jakarta.inject-api:2.0.1
275273
javax.inject:javax.inject:1
276-
net.bytebuddy:byte-buddy-agent:1.14.8
277-
net.bytebuddy:byte-buddy:1.14.8
278274
org.checkerframework:checker-qual:3.12.0
279275
org.jetbrains.androidx.core:core-bundle-android-debug:1.0.1
280276
org.jetbrains.androidx.core:core-bundle:1.0.1
@@ -311,7 +307,6 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
311307
org.jetbrains.compose.ui:ui:1.7.0-rc01
312308
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
313309
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
314-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
315310
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
316311
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
317312
org.jetbrains.kotlin:kotlin-stdlib:2.1.0

‎androidApp/dependencies/prodReleaseRuntimeClasspath.txt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
124124
androidx.viewpager:viewpager:1.0.0
125125
androidx.window.extensions.core:core:1.0.0
126126
androidx.window:window:1.2.0
127-
app.cash.turbine:turbine-jvm:1.1.0
128-
app.cash.turbine:turbine:1.1.0
129127
co.touchlab:kermit-android:2.0.4
130128
co.touchlab:kermit-core-android:2.0.4
131129
co.touchlab:kermit-core:2.0.4
@@ -268,8 +266,6 @@ io.ktor:ktor-websockets:3.0.3
268266
io.michaelrocks:libphonenumber-android:8.13.35
269267
jakarta.inject:jakarta.inject-api:2.0.1
270268
javax.inject:javax.inject:1
271-
net.bytebuddy:byte-buddy-agent:1.14.8
272-
net.bytebuddy:byte-buddy:1.14.8
273269
org.checkerframework:checker-qual:3.12.0
274270
org.jetbrains.androidx.core:core-bundle-android:1.0.1
275271
org.jetbrains.androidx.core:core-bundle:1.0.1
@@ -306,7 +302,6 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
306302
org.jetbrains.compose.ui:ui:1.7.0-rc01
307303
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
308304
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
309-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
310305
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
311306
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
312307
org.jetbrains.kotlin:kotlin-stdlib:2.1.0
@@ -320,8 +315,6 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.1
320315
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1
321316
org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.1
322317
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.1
323-
org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.10.1
324-
org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1
325318
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1
326319
org.jetbrains.kotlinx:kotlinx-datetime:0.6.1
327320
org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.5.4

0 commit comments

Comments
 (0)