Feat: [:core:network] - Migrated to KMP (#2739)

openMF · Jan 14, 2025 · 4b60246 · 4b60246
1 parent 7520dd3
commit 4b60246
Show file tree

Hide file tree

Showing 141 changed files with 1,025 additions and 935 deletions.
diff --git a/androidApp/dependencies/demoDebugRuntimeClasspath.txt b/androidApp/dependencies/demoDebugRuntimeClasspath.txt
@@ -188,11 +188,9 @@ com.russhwolf:multiplatform-settings-no-arg:1.2.0
 com.russhwolf:multiplatform-settings-serialization-android-debug:1.2.0
 com.russhwolf:multiplatform-settings-serialization:1.2.0
 com.russhwolf:multiplatform-settings:1.2.0
-com.squareup.okhttp3:logging-interceptor:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.1
 com.squareup.okio:okio:3.9.1
-com.squareup.retrofit2:adapter-rxjava2:2.11.0
 com.squareup.retrofit2:converter-gson:2.11.0
 com.squareup.retrofit2:retrofit:2.11.0
 dev.chrisbanes.snapper:snapper:0.2.2
@@ -239,7 +237,6 @@ io.ktor:ktor-websocket-serialization:3.0.1
 io.ktor:ktor-websockets-jvm:3.0.1
 io.ktor:ktor-websockets:3.0.1
 io.michaelrocks:libphonenumber-android:8.13.35
-io.reactivex.rxjava2:rxjava:2.2.21
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
 net.bytebuddy:byte-buddy-agent:1.14.8
@@ -276,7 +273,7 @@ org.jetbrains.compose.ui:ui:1.7.0-rc01
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
 org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
@@ -306,5 +303,4 @@ 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.reactivestreams:reactive-streams:1.0.4
 org.slf4j:slf4j-api:2.0.16
diff --git a/androidApp/dependencies/demoReleaseRuntimeClasspath.txt b/androidApp/dependencies/demoReleaseRuntimeClasspath.txt
@@ -183,11 +183,9 @@ com.russhwolf:multiplatform-settings-no-arg:1.2.0
 com.russhwolf:multiplatform-settings-serialization-android:1.2.0
 com.russhwolf:multiplatform-settings-serialization:1.2.0
 com.russhwolf:multiplatform-settings:1.2.0
-com.squareup.okhttp3:logging-interceptor:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.1
 com.squareup.okio:okio:3.9.1
-com.squareup.retrofit2:adapter-rxjava2:2.11.0
 com.squareup.retrofit2:converter-gson:2.11.0
 com.squareup.retrofit2:retrofit:2.11.0
 dev.chrisbanes.snapper:snapper:0.2.2
@@ -234,7 +232,6 @@ io.ktor:ktor-websocket-serialization:3.0.1
 io.ktor:ktor-websockets-jvm:3.0.1
 io.ktor:ktor-websockets:3.0.1
 io.michaelrocks:libphonenumber-android:8.13.35
-io.reactivex.rxjava2:rxjava:2.2.21
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
 net.bytebuddy:byte-buddy-agent:1.14.8
@@ -271,7 +268,7 @@ org.jetbrains.compose.ui:ui:1.7.0-rc01
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
 org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
@@ -301,5 +298,4 @@ 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.reactivestreams:reactive-streams:1.0.4
 org.slf4j:slf4j-api:2.0.16
diff --git a/androidApp/dependencies/prodDebugRuntimeClasspath.txt b/androidApp/dependencies/prodDebugRuntimeClasspath.txt
@@ -188,11 +188,9 @@ com.russhwolf:multiplatform-settings-no-arg:1.2.0
 com.russhwolf:multiplatform-settings-serialization-android-debug:1.2.0
 com.russhwolf:multiplatform-settings-serialization:1.2.0
 com.russhwolf:multiplatform-settings:1.2.0
-com.squareup.okhttp3:logging-interceptor:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.1
 com.squareup.okio:okio:3.9.1
-com.squareup.retrofit2:adapter-rxjava2:2.11.0
 com.squareup.retrofit2:converter-gson:2.11.0
 com.squareup.retrofit2:retrofit:2.11.0
 dev.chrisbanes.snapper:snapper:0.2.2
@@ -239,7 +237,6 @@ io.ktor:ktor-websocket-serialization:3.0.1
 io.ktor:ktor-websockets-jvm:3.0.1
 io.ktor:ktor-websockets:3.0.1
 io.michaelrocks:libphonenumber-android:8.13.35
-io.reactivex.rxjava2:rxjava:2.2.21
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
 net.bytebuddy:byte-buddy-agent:1.14.8
@@ -276,7 +273,7 @@ org.jetbrains.compose.ui:ui:1.7.0-rc01
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
 org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
@@ -306,5 +303,4 @@ 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.reactivestreams:reactive-streams:1.0.4
 org.slf4j:slf4j-api:2.0.16
diff --git a/androidApp/dependencies/prodReleaseRuntimeClasspath.txt b/androidApp/dependencies/prodReleaseRuntimeClasspath.txt
@@ -183,11 +183,9 @@ com.russhwolf:multiplatform-settings-no-arg:1.2.0
 com.russhwolf:multiplatform-settings-serialization-android:1.2.0
 com.russhwolf:multiplatform-settings-serialization:1.2.0
 com.russhwolf:multiplatform-settings:1.2.0
-com.squareup.okhttp3:logging-interceptor:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.1
 com.squareup.okio:okio:3.9.1
-com.squareup.retrofit2:adapter-rxjava2:2.11.0
 com.squareup.retrofit2:converter-gson:2.11.0
 com.squareup.retrofit2:retrofit:2.11.0
 dev.chrisbanes.snapper:snapper:0.2.2
@@ -234,7 +232,6 @@ io.ktor:ktor-websocket-serialization:3.0.1
 io.ktor:ktor-websockets-jvm:3.0.1
 io.ktor:ktor-websockets:3.0.1
 io.michaelrocks:libphonenumber-android:8.13.35
-io.reactivex.rxjava2:rxjava:2.2.21
 jakarta.inject:jakarta.inject-api:2.0.1
 javax.inject:javax.inject:1
 net.bytebuddy:byte-buddy-agent:1.14.8
@@ -271,7 +268,7 @@ org.jetbrains.compose.ui:ui:1.7.0-rc01
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
 org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
@@ -301,5 +298,4 @@ 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.reactivestreams:reactive-streams:1.0.4
 org.slf4j:slf4j-api:2.0.16
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -31,8 +31,8 @@ android {
 
 dependencies {
     api(projects.core.common)
-    api(projects.core.model)
-    api(projects.core.network)
+//    api(projects.core.model)
+//    api(projects.core.network)
     api(projects.core.database)
     api(projects.core.datastore)
 

diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Charge.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Charge.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class Charge(
     val clientId: Int? = null,

diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/ChargeTimeType.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/ChargeTimeType.kt
@@ -9,13 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
-/**
- * Created by michaelsosnick on 12/11/16.
- */
-
+@Serializable
 @Parcelize
 data class ChargeTimeType(
     val id: Int = 0,

diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Currency.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Currency.kt
@@ -9,13 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
-/**
- * Created by michaelsosnick on 12/11/16.
- */
-
+@Serializable
 @Parcelize
 data class Currency(
     val code: String? = null,

diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Timeline.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Timeline.kt
@@ -9,6 +9,7 @@
  */
 package org.mifos.mobile.core.model.entity
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
@@ -22,6 +23,7 @@ import org.mifos.mobile.core.model.Parcelize
  * See https://github.com/openMF/android-client/blob/master/LICENSE.md
  */
 
+@Serializable
 @Parcelize
 data class Timeline(
     val submittedOnDate: List<Int> = emptyList(),

diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Transaction.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/Transaction.kt
@@ -9,15 +9,12 @@
  */
 package org.mifos.mobile.core.model.entity
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 import org.mifos.mobile.core.model.entity.client.Type
 
-/**
- * @author Vishwajeet
- * @since 10/8/16.
- */
-
+@Serializable
 @Parcelize
 data class Transaction(
 

diff --git a/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/User.kt b/core/model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/User.kt
@@ -10,13 +10,11 @@
 package org.mifos.mobile.core.model.entity
 
 import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
-/**
- * @author Vishwajeet
- * @since 12/06/16
- */
+@Serializable
 @Parcelize
 data class User(
     val userId: Long = 0,
@@ -32,6 +30,7 @@ data class User(
     val isTwoFactorAuthenticationRequired: Boolean = false,
 ) : Parcelable
 
+@Serializable
 @Parcelize
 data class Role(
     @SerialName("id")

diff --git a/...rc/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/AmortizationType.kt b/...rc/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/AmortizationType.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity.accounts.loan
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class AmortizationType(
     val id: Int? = null,

diff --git a/.../model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/Currency.kt b/.../model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/Currency.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity.accounts.loan
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class Currency(
     val code: String? = null,

diff --git a/...src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/DaysInMonthType.kt b/...src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/DaysInMonthType.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity.accounts.loan
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class DaysInMonthType(
     val id: Int? = null,

diff --git a/.../src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/DaysInYearType.kt b/.../src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/DaysInYearType.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity.accounts.loan
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class DaysInYearType(
     val id: Int? = null,

diff --git a/.../kotlin/org/mifos/mobile/core/model/entity/accounts/loan/InterestCalculationPeriodType.kt b/.../kotlin/org/mifos/mobile/core/model/entity/accounts/loan/InterestCalculationPeriodType.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity.accounts.loan
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class InterestCalculationPeriodType(
     val id: Int? = null,

diff --git a/...Main/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/InterestRateFrequencyType.kt b/...Main/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/InterestRateFrequencyType.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity.accounts.loan
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class InterestRateFrequencyType(
     val id: Int? = null,

diff --git a/.../org/mifos/mobile/core/model/entity/accounts/loan/InterestRecalculationCompoundingType.kt b/.../org/mifos/mobile/core/model/entity/accounts/loan/InterestRecalculationCompoundingType.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity.accounts.loan
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class InterestRecalculationCompoundingType(
     val id: Int? = null,

diff --git a/...Main/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/InterestRecalculationData.kt b/...Main/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/InterestRecalculationData.kt
@@ -10,10 +10,12 @@
 package org.mifos.mobile.core.model.entity.accounts.loan
 
 import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 import org.mifos.mobile.core.model.entity.accounts.loan.calendardata.CalendarData
 
+@Serializable
 @Parcelize
 data class InterestRecalculationData(
     val id: Int? = null,

diff --git a/...el/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/InterestType.kt b/...el/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/InterestType.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity.accounts.loan
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class InterestType(
     val id: Int? = null,

diff --git a/...del/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/LoanAccount.kt b/...del/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/LoanAccount.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity.accounts.loan
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class LoanAccount(
     val id: Long = 0,

diff --git a/.../model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/LoanType.kt b/.../model/src/commonMain/kotlin/org/mifos/mobile/core/model/entity/accounts/loan/LoanType.kt
@@ -9,9 +9,11 @@
  */
 package org.mifos.mobile.core.model.entity.accounts.loan
 
+import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.model.Parcelable
 import org.mifos.mobile.core.model.Parcelize
 
+@Serializable
 @Parcelize
 data class LoanType(
     val id: Int? = null,