Skip to content

Commit 4b60246

Browse files
Feat: [:core:network] - Migrated to KMP (#2739)
1 parent 7520dd3 commit 4b60246

File tree

141 files changed

+1025
-935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+1025
-935
lines changed

androidApp/dependencies/demoDebugRuntimeClasspath.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,9 @@ com.russhwolf:multiplatform-settings-no-arg:1.2.0
188188
com.russhwolf:multiplatform-settings-serialization-android-debug:1.2.0
189189
com.russhwolf:multiplatform-settings-serialization:1.2.0
190190
com.russhwolf:multiplatform-settings:1.2.0
191-
com.squareup.okhttp3:logging-interceptor:4.12.0
192191
com.squareup.okhttp3:okhttp:4.12.0
193192
com.squareup.okio:okio-jvm:3.9.1
194193
com.squareup.okio:okio:3.9.1
195-
com.squareup.retrofit2:adapter-rxjava2:2.11.0
196194
com.squareup.retrofit2:converter-gson:2.11.0
197195
com.squareup.retrofit2:retrofit:2.11.0
198196
dev.chrisbanes.snapper:snapper:0.2.2
@@ -239,7 +237,6 @@ io.ktor:ktor-websocket-serialization:3.0.1
239237
io.ktor:ktor-websockets-jvm:3.0.1
240238
io.ktor:ktor-websockets:3.0.1
241239
io.michaelrocks:libphonenumber-android:8.13.35
242-
io.reactivex.rxjava2:rxjava:2.2.21
243240
jakarta.inject:jakarta.inject-api:2.0.1
244241
javax.inject:javax.inject:1
245242
net.bytebuddy:byte-buddy-agent:1.14.8
@@ -276,7 +273,7 @@ org.jetbrains.compose.ui:ui:1.7.0-rc01
276273
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
277274
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
278275
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
279-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
276+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
280277
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
281278
org.jetbrains.kotlin:kotlin-stdlib:2.1.0
282279
org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
@@ -306,5 +303,4 @@ org.jetbrains:annotations:23.0.0
306303
org.jspecify:jspecify:1.0.0
307304
org.mockito:mockito-core:5.6.0
308305
org.objenesis:objenesis:3.3
309-
org.reactivestreams:reactive-streams:1.0.4
310306
org.slf4j:slf4j-api:2.0.16

androidApp/dependencies/demoReleaseRuntimeClasspath.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,9 @@ com.russhwolf:multiplatform-settings-no-arg:1.2.0
183183
com.russhwolf:multiplatform-settings-serialization-android:1.2.0
184184
com.russhwolf:multiplatform-settings-serialization:1.2.0
185185
com.russhwolf:multiplatform-settings:1.2.0
186-
com.squareup.okhttp3:logging-interceptor:4.12.0
187186
com.squareup.okhttp3:okhttp:4.12.0
188187
com.squareup.okio:okio-jvm:3.9.1
189188
com.squareup.okio:okio:3.9.1
190-
com.squareup.retrofit2:adapter-rxjava2:2.11.0
191189
com.squareup.retrofit2:converter-gson:2.11.0
192190
com.squareup.retrofit2:retrofit:2.11.0
193191
dev.chrisbanes.snapper:snapper:0.2.2
@@ -234,7 +232,6 @@ io.ktor:ktor-websocket-serialization:3.0.1
234232
io.ktor:ktor-websockets-jvm:3.0.1
235233
io.ktor:ktor-websockets:3.0.1
236234
io.michaelrocks:libphonenumber-android:8.13.35
237-
io.reactivex.rxjava2:rxjava:2.2.21
238235
jakarta.inject:jakarta.inject-api:2.0.1
239236
javax.inject:javax.inject:1
240237
net.bytebuddy:byte-buddy-agent:1.14.8
@@ -271,7 +268,7 @@ org.jetbrains.compose.ui:ui:1.7.0-rc01
271268
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
272269
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
273270
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
274-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
271+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
275272
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
276273
org.jetbrains.kotlin:kotlin-stdlib:2.1.0
277274
org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
@@ -301,5 +298,4 @@ org.jetbrains:annotations:23.0.0
301298
org.jspecify:jspecify:1.0.0
302299
org.mockito:mockito-core:5.6.0
303300
org.objenesis:objenesis:3.3
304-
org.reactivestreams:reactive-streams:1.0.4
305301
org.slf4j:slf4j-api:2.0.16

androidApp/dependencies/prodDebugRuntimeClasspath.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,9 @@ com.russhwolf:multiplatform-settings-no-arg:1.2.0
188188
com.russhwolf:multiplatform-settings-serialization-android-debug:1.2.0
189189
com.russhwolf:multiplatform-settings-serialization:1.2.0
190190
com.russhwolf:multiplatform-settings:1.2.0
191-
com.squareup.okhttp3:logging-interceptor:4.12.0
192191
com.squareup.okhttp3:okhttp:4.12.0
193192
com.squareup.okio:okio-jvm:3.9.1
194193
com.squareup.okio:okio:3.9.1
195-
com.squareup.retrofit2:adapter-rxjava2:2.11.0
196194
com.squareup.retrofit2:converter-gson:2.11.0
197195
com.squareup.retrofit2:retrofit:2.11.0
198196
dev.chrisbanes.snapper:snapper:0.2.2
@@ -239,7 +237,6 @@ io.ktor:ktor-websocket-serialization:3.0.1
239237
io.ktor:ktor-websockets-jvm:3.0.1
240238
io.ktor:ktor-websockets:3.0.1
241239
io.michaelrocks:libphonenumber-android:8.13.35
242-
io.reactivex.rxjava2:rxjava:2.2.21
243240
jakarta.inject:jakarta.inject-api:2.0.1
244241
javax.inject:javax.inject:1
245242
net.bytebuddy:byte-buddy-agent:1.14.8
@@ -276,7 +273,7 @@ org.jetbrains.compose.ui:ui:1.7.0-rc01
276273
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
277274
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
278275
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
279-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
276+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
280277
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
281278
org.jetbrains.kotlin:kotlin-stdlib:2.1.0
282279
org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
@@ -306,5 +303,4 @@ org.jetbrains:annotations:23.0.0
306303
org.jspecify:jspecify:1.0.0
307304
org.mockito:mockito-core:5.6.0
308305
org.objenesis:objenesis:3.3
309-
org.reactivestreams:reactive-streams:1.0.4
310306
org.slf4j:slf4j-api:2.0.16

androidApp/dependencies/prodReleaseRuntimeClasspath.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,9 @@ com.russhwolf:multiplatform-settings-no-arg:1.2.0
183183
com.russhwolf:multiplatform-settings-serialization-android:1.2.0
184184
com.russhwolf:multiplatform-settings-serialization:1.2.0
185185
com.russhwolf:multiplatform-settings:1.2.0
186-
com.squareup.okhttp3:logging-interceptor:4.12.0
187186
com.squareup.okhttp3:okhttp:4.12.0
188187
com.squareup.okio:okio-jvm:3.9.1
189188
com.squareup.okio:okio:3.9.1
190-
com.squareup.retrofit2:adapter-rxjava2:2.11.0
191189
com.squareup.retrofit2:converter-gson:2.11.0
192190
com.squareup.retrofit2:retrofit:2.11.0
193191
dev.chrisbanes.snapper:snapper:0.2.2
@@ -234,7 +232,6 @@ io.ktor:ktor-websocket-serialization:3.0.1
234232
io.ktor:ktor-websockets-jvm:3.0.1
235233
io.ktor:ktor-websockets:3.0.1
236234
io.michaelrocks:libphonenumber-android:8.13.35
237-
io.reactivex.rxjava2:rxjava:2.2.21
238235
jakarta.inject:jakarta.inject-api:2.0.1
239236
javax.inject:javax.inject:1
240237
net.bytebuddy:byte-buddy-agent:1.14.8
@@ -271,7 +268,7 @@ org.jetbrains.compose.ui:ui:1.7.0-rc01
271268
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
272269
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
273270
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
274-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
271+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
275272
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
276273
org.jetbrains.kotlin:kotlin-stdlib:2.1.0
277274
org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
@@ -301,5 +298,4 @@ org.jetbrains:annotations:23.0.0
301298
org.jspecify:jspecify:1.0.0
302299
org.mockito:mockito-core:5.6.0
303300
org.objenesis:objenesis:3.3
304-
org.reactivestreams:reactive-streams:1.0.4
305301
org.slf4j:slf4j-api:2.0.16

core/data/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ android {
3131

3232
dependencies {
3333
api(projects.core.common)
34-
api(projects.core.model)
35-
api(projects.core.network)
34+
// api(projects.core.model)
35+
// api(projects.core.network)
3636
api(projects.core.database)
3737
api(projects.core.datastore)
3838

core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Charge.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
*/
1010
package org.mifos.mobile.core.model.entity
1111

12+
import kotlinx.serialization.Serializable
1213
import org.mifos.mobile.core.model.Parcelable
1314
import org.mifos.mobile.core.model.Parcelize
1415

16+
@Serializable
1517
@Parcelize
1618
data class Charge(
1719
val clientId: Int? = null,

core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/ChargeTimeType.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@
99
*/
1010
package org.mifos.mobile.core.model.entity
1111

12+
import kotlinx.serialization.Serializable
1213
import org.mifos.mobile.core.model.Parcelable
1314
import org.mifos.mobile.core.model.Parcelize
1415

15-
/**
16-
* Created by michaelsosnick on 12/11/16.
17-
*/
18-
16+
@Serializable
1917
@Parcelize
2018
data class ChargeTimeType(
2119
val id: Int = 0,

core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Currency.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@
99
*/
1010
package org.mifos.mobile.core.model.entity
1111

12+
import kotlinx.serialization.Serializable
1213
import org.mifos.mobile.core.model.Parcelable
1314
import org.mifos.mobile.core.model.Parcelize
1415

15-
/**
16-
* Created by michaelsosnick on 12/11/16.
17-
*/
18-
16+
@Serializable
1917
@Parcelize
2018
data class Currency(
2119
val code: String? = null,

core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Timeline.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010
package org.mifos.mobile.core.model.entity
1111

12+
import kotlinx.serialization.Serializable
1213
import org.mifos.mobile.core.model.Parcelable
1314
import org.mifos.mobile.core.model.Parcelize
1415

@@ -22,6 +23,7 @@ import org.mifos.mobile.core.model.Parcelize
2223
* See https://github.com/openMF/android-client/blob/master/LICENSE.md
2324
*/
2425

26+
@Serializable
2527
@Parcelize
2628
data class Timeline(
2729
val submittedOnDate: List<Int> = emptyList(),

core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Transaction.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@
99
*/
1010
package org.mifos.mobile.core.model.entity
1111

12+
import kotlinx.serialization.Serializable
1213
import org.mifos.mobile.core.model.Parcelable
1314
import org.mifos.mobile.core.model.Parcelize
1415
import org.mifos.mobile.core.model.entity.client.Type
1516

16-
/**
17-
* @author Vishwajeet
18-
* @since 10/8/16.
19-
*/
20-
17+
@Serializable
2118
@Parcelize
2219
data class Transaction(
2320

0 commit comments

Comments
 (0)