diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index fc5ce866..501f1c6f 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -84,8 +84,8 @@ jobs: uses: openMF/mifos-x-actionhub/.github/workflows/pr-check.yaml@v1.0.2 secrets: inherit with: - android_package_name: 'mifospay-android' # <-- Change Your Android Package Name - desktop_package_name: 'mifospay-desktop' # <-- Change Your Desktop Package Name - web_package_name: 'mifospay-web' # <-- Change Your Web Package Name - ios_package_name: 'mifospay-ios' # <-- Change Your iOS Package Name + android_package_name: 'cmp-android' # <-- Change Your Android Package Name + desktop_package_name: 'cmp-desktop' # <-- Change Your Desktop Package Name + web_package_name: 'cmp-web' # <-- Change Your Web Package Name + ios_package_name: 'cmp-ios' # <-- Change Your iOS Package Name build_ios: true diff --git a/ci-prepush.sh b/ci-prepush.sh index 6689fd49..14d83940 100644 --- a/ci-prepush.sh +++ b/ci-prepush.sh @@ -28,8 +28,8 @@ tasks=( "spotlessApply --no-configuration-cache" "dependencyGuardBaseline" "detekt" - ":mifospay-android:build" - ":mifospay-android:updateProdReleaseBadging" + ":cmp-android:build" + ":cmp-android:updateProdReleaseBadging" ) for task in "${tasks[@]}"; do diff --git a/mifospay-android/.gitignore b/cmp-android/.gitignore similarity index 100% rename from mifospay-android/.gitignore rename to cmp-android/.gitignore diff --git a/mifospay-android/README.md b/cmp-android/README.md similarity index 100% rename from mifospay-android/README.md rename to cmp-android/README.md diff --git a/mifospay-android/build.gradle.kts b/cmp-android/build.gradle.kts similarity index 99% rename from mifospay-android/build.gradle.kts rename to cmp-android/build.gradle.kts index 7e086389..9e211dd1 100644 --- a/mifospay-android/build.gradle.kts +++ b/cmp-android/build.gradle.kts @@ -80,7 +80,7 @@ android { } dependencies { - implementation(projects.mifospayShared) + implementation(projects.cmpShared) implementation(projects.core.data) implementation(projects.core.ui) diff --git a/mifospay-android/dependencies/prodReleaseRuntimeClasspath.tree.txt b/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt similarity index 99% rename from mifospay-android/dependencies/prodReleaseRuntimeClasspath.tree.txt rename to cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt index faa6a29e..36d16ee0 100644 --- a/mifospay-android/dependencies/prodReleaseRuntimeClasspath.tree.txt +++ b/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt @@ -1,18 +1,18 @@ -+--- androidx.databinding:databinding-common:8.7.3 -+--- androidx.databinding:databinding-runtime:8.7.3 ++--- androidx.databinding:databinding-common:8.11.1 ++--- androidx.databinding:databinding-runtime:8.11.1 | +--- androidx.collection:collection:1.0.0 -> 1.5.0 | | \--- androidx.collection:collection-jvm:1.5.0 | | +--- androidx.annotation:annotation:1.9.1 | | | \--- androidx.annotation:annotation-jvm:1.9.1 | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 2.1.21 | | | +--- org.jetbrains:annotations:13.0 -> 23.0.0 -| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0 -> 1.9.20 (c) -| | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.20 (c) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0 -> 1.9.0 (c) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.8.22 (c) | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*) | | +--- androidx.collection:collection-ktx:1.5.0 (c) | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 2.1.21 (c) -| +--- androidx.databinding:databinding-common:8.7.3 -| +--- androidx.databinding:viewbinding:8.7.3 +| +--- androidx.databinding:databinding-common:8.11.1 +| +--- androidx.databinding:viewbinding:8.11.1 | | \--- androidx.annotation:annotation:1.0.0 -> 1.9.1 (*) | \--- androidx.lifecycle:lifecycle-runtime:2.6.1 -> 2.9.2 | \--- androidx.lifecycle:lifecycle-runtime-android:2.9.2 @@ -88,15 +88,12 @@ | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2 (c) | +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 -> 2.1.21 (c) | \--- androidx.lifecycle:lifecycle-common-java8:2.9.2 (c) -+--- androidx.databinding:databinding-adapters:8.7.3 -| +--- androidx.databinding:databinding-runtime:8.7.3 (*) -| \--- androidx.databinding:databinding-common:8.7.3 -+--- androidx.databinding:databinding-ktx:8.7.3 -| +--- androidx.databinding:databinding-runtime:8.7.3 (*) -| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.20 -> 2.1.21 (*) -| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20 -| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.20 -> 2.1.21 (*) ++--- androidx.databinding:databinding-adapters:8.11.1 +| +--- androidx.databinding:databinding-runtime:8.11.1 (*) +| \--- androidx.databinding:databinding-common:8.11.1 ++--- androidx.databinding:databinding-ktx:8.11.1 +| +--- androidx.databinding:databinding-runtime:8.11.1 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.1.21 (*) | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.10.2 (*) | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 -> 2.9.2 | | \--- androidx.lifecycle:lifecycle-runtime-ktx-android:2.9.2 @@ -295,7 +292,7 @@ | +--- androidx.compose.ui:ui-text:1.8.3 (c) | +--- androidx.compose.ui:ui-unit:1.8.3 (c) | \--- androidx.compose.ui:ui-util:1.8.3 (c) -+--- project :mifospay-shared ++--- project :cmp-shared | +--- androidx.lifecycle:lifecycle-runtime-compose:2.9.2 | | \--- androidx.lifecycle:lifecycle-runtime-compose-android:2.9.2 | | +--- androidx.annotation:annotation:1.9.1 (*) @@ -1191,10 +1188,13 @@ | | | | +--- io.ktor:ktor-client-core:3.1.2 (*) | | | | +--- com.squareup.okhttp3:okhttp:4.12.0 | | | | | +--- com.squareup.okio:okio:3.6.0 -> 3.15.0 (*) -| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.20 (*) +| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.8.22 +| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.1.21 (*) +| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 -> 1.9.0 +| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.0 -> 2.1.21 (*) | | | | +--- com.squareup.okhttp3:okhttp-sse:4.12.0 | | | | | +--- com.squareup.okhttp3:okhttp:4.12.0 (*) -| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.20 (*) +| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.8.22 (*) | | | | +--- com.squareup.okio:okio:3.10.2 -> 3.15.0 (*) | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1 -> 1.10.2 (*) | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.1.21 (*) @@ -1262,13 +1262,13 @@ | | | | | +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0 (*) | | | | | \--- org.jetbrains.kotlinx:kotlinx-io-core:0.4.0 -> 0.7.0 (*) | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.1.21 (*) -| | | +--- de.jensklingenberg.ktorfit:ktorfit-lib:2.5.0 -| | | | \--- de.jensklingenberg.ktorfit:ktorfit-lib-android:2.5.0 +| | | +--- de.jensklingenberg.ktorfit:ktorfit-lib:2.5.2 +| | | | \--- de.jensklingenberg.ktorfit:ktorfit-lib-android:2.5.2 | | | | +--- io.ktor:ktor-client-okhttp:3.1.2 (*) -| | | | +--- de.jensklingenberg.ktorfit:ktorfit-lib-light:2.5.0 -| | | | | \--- de.jensklingenberg.ktorfit:ktorfit-lib-light-android:2.5.0 -| | | | | +--- de.jensklingenberg.ktorfit:ktorfit-annotations:2.5.0 -| | | | | | \--- de.jensklingenberg.ktorfit:ktorfit-annotations-android:2.5.0 +| | | | +--- de.jensklingenberg.ktorfit:ktorfit-lib-light:2.5.2 +| | | | | \--- de.jensklingenberg.ktorfit:ktorfit-lib-light-android:2.5.2 +| | | | | +--- de.jensklingenberg.ktorfit:ktorfit-annotations:2.5.2 +| | | | | | \--- de.jensklingenberg.ktorfit:ktorfit-annotations-android:2.5.2 | | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 -> 2.1.21 (*) | | | | | +--- io.ktor:ktor-client-core:3.1.2 (*) | | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.10 -> 2.1.21 (*) @@ -1377,7 +1377,7 @@ | | | | | | | \--- com.google.android.gms:play-services-tasks:18.1.0 -> 18.2.0 (*) | | | | | | +--- com.google.firebase:firebase-common-ktx:21.0.0 | | | | | | | +--- com.google.firebase:firebase-common:21.0.0 (*) -| | | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.20 (*) +| | | | | | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 (*) | | | | | | | +--- com.google.firebase:firebase-components:18.0.0 (*) | | | | | | | \--- com.google.firebase:firebase-annotations:16.2.0 (*) | | | | | | +--- com.google.firebase:firebase-components:18.0.0 (*) @@ -1439,7 +1439,7 @@ | | | +--- androidx.compose.foundation:foundation:1.7.0 -> 1.8.3 (*) | | | +--- dev.chrisbanes.snapper:snapper:0.2.2 | | | | +--- androidx.compose.foundation:foundation:1.1.1 -> 1.8.3 (*) -| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.9.20 (*) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 -> 1.8.22 (*) | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.1.21 (*) | | +--- project :core:analytics (*) | | +--- project :core:designsystem @@ -1759,7 +1759,7 @@ | | | | | +--- com.google.android.gms:play-services-base:18.3.0 -> 18.5.0 (*) | | | | | +--- com.google.android.gms:play-services-basement:18.3.0 -> 18.5.0 (*) | | | | | +--- com.google.android.gms:play-services-tasks:18.1.0 -> 18.2.0 (*) -| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 -> 1.9.20 (*) +| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 (*) | | | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 -> 1.10.2 (*) | | | | \--- com.google.android.gms:play-services-tasks:18.2.0 (*) | | | +--- com.google.android.gms:play-services-auth-blockstore:16.4.0 @@ -1776,7 +1776,7 @@ | | | +--- com.google.android.libraries.identity.googleid:googleid:1.1.0 -> 1.1.1 | | | | +--- androidx.credentials:credentials:1.3.0-beta01 -> 1.5.0 (*) | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 2.1.21 (*) -| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.20 (*) +| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.8.22 (*) | | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.1.21 (*) | | | +--- androidx.credentials:credentials:1.5.0 (c) | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 -> 2.1.21 (c) diff --git a/mifospay-android/dependencies/prodReleaseRuntimeClasspath.txt b/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt similarity index 96% rename from mifospay-android/dependencies/prodReleaseRuntimeClasspath.txt rename to cmp-android/dependencies/prodReleaseRuntimeClasspath.txt index 64a03435..cf2192a1 100644 --- a/mifospay-android/dependencies/prodReleaseRuntimeClasspath.txt +++ b/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt @@ -1,3 +1,4 @@ +:cmp-shared :core:analytics :core:common :core:data @@ -30,7 +31,6 @@ :feature:standing-instruction :feature:upi-setup :libs:mifos-passcode -:mifospay-shared androidx.activity:activity-compose:1.10.1 androidx.activity:activity-ktx:1.10.1 androidx.activity:activity:1.10.1 @@ -105,11 +105,11 @@ androidx.credentials:credentials:1.5.0 androidx.cursoradapter:cursoradapter:1.0.0 androidx.customview:customview-poolingcontainer:1.0.0 androidx.customview:customview:1.1.0 -androidx.databinding:databinding-adapters:8.7.3 -androidx.databinding:databinding-common:8.7.3 -androidx.databinding:databinding-ktx:8.7.3 -androidx.databinding:databinding-runtime:8.7.3 -androidx.databinding:viewbinding:8.7.3 +androidx.databinding:databinding-adapters:8.11.1 +androidx.databinding:databinding-common:8.11.1 +androidx.databinding:databinding-ktx:8.11.1 +androidx.databinding:databinding-runtime:8.11.1 +androidx.databinding:viewbinding:8.11.1 androidx.documentfile:documentfile:1.1.0 androidx.drawerlayout:drawerlayout:1.0.0 androidx.emoji2:emoji2-views-helper:1.4.0 @@ -258,12 +258,12 @@ com.squareup.okhttp3:okhttp-sse:4.12.0 com.squareup.okhttp3:okhttp:4.12.0 com.squareup.okio:okio-jvm:3.15.0 com.squareup.okio:okio:3.15.0 -de.jensklingenberg.ktorfit:ktorfit-annotations-android:2.5.0 -de.jensklingenberg.ktorfit:ktorfit-annotations:2.5.0 -de.jensklingenberg.ktorfit:ktorfit-lib-android:2.5.0 -de.jensklingenberg.ktorfit:ktorfit-lib-light-android:2.5.0 -de.jensklingenberg.ktorfit:ktorfit-lib-light:2.5.0 -de.jensklingenberg.ktorfit:ktorfit-lib:2.5.0 +de.jensklingenberg.ktorfit:ktorfit-annotations-android:2.5.2 +de.jensklingenberg.ktorfit:ktorfit-annotations:2.5.2 +de.jensklingenberg.ktorfit:ktorfit-lib-android:2.5.2 +de.jensklingenberg.ktorfit:ktorfit-lib-light-android:2.5.2 +de.jensklingenberg.ktorfit:ktorfit-lib-light:2.5.2 +de.jensklingenberg.ktorfit:ktorfit-lib:2.5.2 dev.chrisbanes.material3:material3-window-size-class-multiplatform-android:0.5.0 dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0 dev.chrisbanes.snapper:snapper:0.2.2 @@ -385,8 +385,8 @@ org.jetbrains.compose.ui:ui:1.8.2 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.20 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.20 org.jetbrains.kotlin:kotlin-reflect:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 org.jetbrains.kotlin:kotlin-stdlib:2.1.21 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8 diff --git a/mifospay-android/google-services.json b/cmp-android/google-services.json similarity index 100% rename from mifospay-android/google-services.json rename to cmp-android/google-services.json diff --git a/mifospay-android/lint-baseline.xml b/cmp-android/lint-baseline.xml similarity index 100% rename from mifospay-android/lint-baseline.xml rename to cmp-android/lint-baseline.xml diff --git a/mifospay-android/prodRelease-badging.txt b/cmp-android/prodRelease-badging.txt similarity index 98% rename from mifospay-android/prodRelease-badging.txt rename to cmp-android/prodRelease-badging.txt index a274be18..e3e00930 100644 --- a/mifospay-android/prodRelease-badging.txt +++ b/cmp-android/prodRelease-badging.txt @@ -1,5 +1,5 @@ -package: name='org.mifospay' versionCode='1' versionName='2025.7.4-beta.0.4' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15' -sdkVersion:'26' +package: name='org.mifospay' versionCode='1' versionName='2025.7.4-beta.0.5' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15' +minSdkVersion:'26' targetSdkVersion:'34' uses-permission: name='android.permission.INTERNET' uses-permission: name='android.permission.CAMERA' diff --git a/mifospay-android/proguard-rules.pro b/cmp-android/proguard-rules.pro similarity index 100% rename from mifospay-android/proguard-rules.pro rename to cmp-android/proguard-rules.pro diff --git a/mifospay-android/src/main/AndroidManifest.xml b/cmp-android/src/main/AndroidManifest.xml similarity index 100% rename from mifospay-android/src/main/AndroidManifest.xml rename to cmp-android/src/main/AndroidManifest.xml diff --git a/mifospay-android/src/main/ic_launcher-playstore.png b/cmp-android/src/main/ic_launcher-playstore.png similarity index 100% rename from mifospay-android/src/main/ic_launcher-playstore.png rename to cmp-android/src/main/ic_launcher-playstore.png diff --git a/mifospay-android/src/main/kotlin/org/mifospay/MainActivity.kt b/cmp-android/src/main/kotlin/org/mifospay/MainActivity.kt similarity index 100% rename from mifospay-android/src/main/kotlin/org/mifospay/MainActivity.kt rename to cmp-android/src/main/kotlin/org/mifospay/MainActivity.kt diff --git a/mifospay-android/src/main/kotlin/org/mifospay/MifosPayApp.kt b/cmp-android/src/main/kotlin/org/mifospay/MifosPayApp.kt similarity index 100% rename from mifospay-android/src/main/kotlin/org/mifospay/MifosPayApp.kt rename to cmp-android/src/main/kotlin/org/mifospay/MifosPayApp.kt diff --git a/mifospay-android/src/main/res/drawable/ic_launcher_foreground.xml b/cmp-android/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from mifospay-android/src/main/res/drawable/ic_launcher_foreground.xml rename to cmp-android/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/mifospay-android/src/main/res/drawable/mifospay_logo_512.xml b/cmp-android/src/main/res/drawable/mifospay_logo_512.xml similarity index 100% rename from mifospay-android/src/main/res/drawable/mifospay_logo_512.xml rename to cmp-android/src/main/res/drawable/mifospay_logo_512.xml diff --git a/mifospay-android/src/main/res/drawable/mifospay_logo_filled.xml b/cmp-android/src/main/res/drawable/mifospay_logo_filled.xml similarity index 100% rename from mifospay-android/src/main/res/drawable/mifospay_logo_filled.xml rename to cmp-android/src/main/res/drawable/mifospay_logo_filled.xml diff --git a/mifospay-android/src/main/res/drawable/mifospay_logo_transparent.xml b/cmp-android/src/main/res/drawable/mifospay_logo_transparent.xml similarity index 100% rename from mifospay-android/src/main/res/drawable/mifospay_logo_transparent.xml rename to cmp-android/src/main/res/drawable/mifospay_logo_transparent.xml diff --git a/mifospay-android/src/main/res/drawable/mifospay_round_logo.png b/cmp-android/src/main/res/drawable/mifospay_round_logo.png similarity index 100% rename from mifospay-android/src/main/res/drawable/mifospay_round_logo.png rename to cmp-android/src/main/res/drawable/mifospay_round_logo.png diff --git a/mifospay-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/cmp-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from mifospay-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to cmp-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/mifospay-android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/cmp-android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from mifospay-android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to cmp-android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/mifospay-android/src/main/res/mipmap-hdpi/ic_launcher.webp b/cmp-android/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from mifospay-android/src/main/res/mipmap-hdpi/ic_launcher.webp rename to cmp-android/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/mifospay-android/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/cmp-android/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from mifospay-android/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to cmp-android/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/mifospay-android/src/main/res/mipmap-mdpi/ic_launcher.webp b/cmp-android/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from mifospay-android/src/main/res/mipmap-mdpi/ic_launcher.webp rename to cmp-android/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/mifospay-android/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/cmp-android/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from mifospay-android/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to cmp-android/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/mifospay-android/src/main/res/mipmap-xhdpi/ic_launcher.webp b/cmp-android/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from mifospay-android/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to cmp-android/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/mifospay-android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/cmp-android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from mifospay-android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to cmp-android/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/mifospay-android/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/cmp-android/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from mifospay-android/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to cmp-android/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/mifospay-android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/cmp-android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from mifospay-android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to cmp-android/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/mifospay-android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/cmp-android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from mifospay-android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to cmp-android/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/mifospay-android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/cmp-android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from mifospay-android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to cmp-android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/mifospay-android/src/main/res/values/colors.xml b/cmp-android/src/main/res/values/colors.xml similarity index 100% rename from mifospay-android/src/main/res/values/colors.xml rename to cmp-android/src/main/res/values/colors.xml diff --git a/mifospay-android/src/main/res/values/ic_launcher_background.xml b/cmp-android/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from mifospay-android/src/main/res/values/ic_launcher_background.xml rename to cmp-android/src/main/res/values/ic_launcher_background.xml diff --git a/mifospay-android/src/main/res/values/splash.xml b/cmp-android/src/main/res/values/splash.xml similarity index 100% rename from mifospay-android/src/main/res/values/splash.xml rename to cmp-android/src/main/res/values/splash.xml diff --git a/mifospay-android/src/main/res/values/strings.xml b/cmp-android/src/main/res/values/strings.xml similarity index 100% rename from mifospay-android/src/main/res/values/strings.xml rename to cmp-android/src/main/res/values/strings.xml diff --git a/mifospay-android/src/main/res/xml/provider_paths.xml b/cmp-android/src/main/res/xml/provider_paths.xml similarity index 100% rename from mifospay-android/src/main/res/xml/provider_paths.xml rename to cmp-android/src/main/res/xml/provider_paths.xml diff --git a/mifospay-desktop/.gitignore b/cmp-desktop/.gitignore similarity index 100% rename from mifospay-desktop/.gitignore rename to cmp-desktop/.gitignore diff --git a/mifospay-desktop/README.md b/cmp-desktop/README.md similarity index 100% rename from mifospay-desktop/README.md rename to cmp-desktop/README.md diff --git a/mifospay-desktop/build.gradle.kts b/cmp-desktop/build.gradle.kts similarity index 98% rename from mifospay-desktop/build.gradle.kts rename to cmp-desktop/build.gradle.kts index 10e0302f..1b273ede 100644 --- a/mifospay-desktop/build.gradle.kts +++ b/cmp-desktop/build.gradle.kts @@ -29,7 +29,7 @@ kotlin { implementation(projects.core.model) implementation(projects.core.datastore) - implementation(projects.mifospayShared) + implementation(projects.cmpShared) implementation(libs.kotlinx.coroutines.swing) implementation(compose.desktop.currentOs) diff --git a/mifospay-desktop/compose-desktop.pro b/cmp-desktop/compose-desktop.pro similarity index 100% rename from mifospay-desktop/compose-desktop.pro rename to cmp-desktop/compose-desktop.pro diff --git a/mifospay-desktop/icons/ic_launcher.icns b/cmp-desktop/icons/ic_launcher.icns similarity index 100% rename from mifospay-desktop/icons/ic_launcher.icns rename to cmp-desktop/icons/ic_launcher.icns diff --git a/mifospay-desktop/icons/ic_launcher.ico b/cmp-desktop/icons/ic_launcher.ico similarity index 100% rename from mifospay-desktop/icons/ic_launcher.ico rename to cmp-desktop/icons/ic_launcher.ico diff --git a/mifospay-desktop/icons/ic_launcher.png b/cmp-desktop/icons/ic_launcher.png similarity index 100% rename from mifospay-desktop/icons/ic_launcher.png rename to cmp-desktop/icons/ic_launcher.png diff --git a/mifospay-desktop/src/desktopMain/kotlin/main.kt b/cmp-desktop/src/desktopMain/kotlin/main.kt similarity index 100% rename from mifospay-desktop/src/desktopMain/kotlin/main.kt rename to cmp-desktop/src/desktopMain/kotlin/main.kt diff --git a/mifospay-ios/Configuration/Config.xcconfig b/cmp-ios/Configuration/Config.xcconfig similarity index 100% rename from mifospay-ios/Configuration/Config.xcconfig rename to cmp-ios/Configuration/Config.xcconfig diff --git a/mifospay-ios/iosApp.xcodeproj/project.pbxproj b/cmp-ios/iosApp.xcodeproj/project.pbxproj similarity index 99% rename from mifospay-ios/iosApp.xcodeproj/project.pbxproj rename to cmp-ios/iosApp.xcodeproj/project.pbxproj index 7ab73fc8..4ad128c2 100644 --- a/mifospay-ios/iosApp.xcodeproj/project.pbxproj +++ b/cmp-ios/iosApp.xcodeproj/project.pbxproj @@ -175,7 +175,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :mifospay-shared:embedAndSignAppleFrameworkForXcode\n"; + shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :cmp-shared:embedAndSignAppleFrameworkForXcode\n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/mifospay-ios/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/cmp-ios/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from mifospay-ios/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to cmp-ios/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/cmp-ios/iosApp.xcodeproj/project.xcworkspace/xcuserdata/kapilmaurya.xcuserdatad/UserInterfaceState.xcuserstate b/cmp-ios/iosApp.xcodeproj/project.xcworkspace/xcuserdata/kapilmaurya.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 00000000..427b7652 Binary files /dev/null and b/cmp-ios/iosApp.xcodeproj/project.xcworkspace/xcuserdata/kapilmaurya.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/cmp-ios/iosApp.xcodeproj/xcuserdata/hekmatullahamin.xcuserdatad/xcschemes/iosApp.xcscheme b/cmp-ios/iosApp.xcodeproj/xcuserdata/hekmatullahamin.xcuserdatad/xcschemes/iosApp.xcscheme new file mode 100644 index 00000000..83776d77 --- /dev/null +++ b/cmp-ios/iosApp.xcodeproj/xcuserdata/hekmatullahamin.xcuserdatad/xcschemes/iosApp.xcscheme @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mifospay-ios/iosApp.xcodeproj/xcuserdata/kapilmaurya.xcuserdatad/xcschemes/xcschememanagement.plist b/cmp-ios/iosApp.xcodeproj/xcuserdata/kapilmaurya.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from mifospay-ios/iosApp.xcodeproj/xcuserdata/kapilmaurya.xcuserdatad/xcschemes/xcschememanagement.plist rename to cmp-ios/iosApp.xcodeproj/xcuserdata/kapilmaurya.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/mifospay-ios/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json b/cmp-ios/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from mifospay-ios/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json rename to cmp-ios/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/mifospay-ios/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/cmp-ios/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from mifospay-ios/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json rename to cmp-ios/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/mifospay-ios/iosApp/Assets.xcassets/AppIcon.appiconset/mifospay_logo_1024.png b/cmp-ios/iosApp/Assets.xcassets/AppIcon.appiconset/mifospay_logo_1024.png similarity index 100% rename from mifospay-ios/iosApp/Assets.xcassets/AppIcon.appiconset/mifospay_logo_1024.png rename to cmp-ios/iosApp/Assets.xcassets/AppIcon.appiconset/mifospay_logo_1024.png diff --git a/mifospay-ios/iosApp/Assets.xcassets/Contents.json b/cmp-ios/iosApp/Assets.xcassets/Contents.json similarity index 100% rename from mifospay-ios/iosApp/Assets.xcassets/Contents.json rename to cmp-ios/iosApp/Assets.xcassets/Contents.json diff --git a/mifospay-ios/iosApp/ContentView.swift b/cmp-ios/iosApp/ContentView.swift similarity index 100% rename from mifospay-ios/iosApp/ContentView.swift rename to cmp-ios/iosApp/ContentView.swift diff --git a/mifospay-ios/iosApp/Info.plist b/cmp-ios/iosApp/Info.plist similarity index 100% rename from mifospay-ios/iosApp/Info.plist rename to cmp-ios/iosApp/Info.plist diff --git a/mifospay-ios/iosApp/Preview Content/Preview Assets.xcassets/Contents.json b/cmp-ios/iosApp/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from mifospay-ios/iosApp/Preview Content/Preview Assets.xcassets/Contents.json rename to cmp-ios/iosApp/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/mifospay-ios/iosApp/iOSApp.swift b/cmp-ios/iosApp/iOSApp.swift similarity index 100% rename from mifospay-ios/iosApp/iOSApp.swift rename to cmp-ios/iosApp/iOSApp.swift diff --git a/mifospay-shared/README.md b/cmp-shared/README.md similarity index 100% rename from mifospay-shared/README.md rename to cmp-shared/README.md diff --git a/mifospay-shared/build.gradle.kts b/cmp-shared/build.gradle.kts similarity index 99% rename from mifospay-shared/build.gradle.kts rename to cmp-shared/build.gradle.kts index 009f1426..cf479cf4 100644 --- a/mifospay-shared/build.gradle.kts +++ b/cmp-shared/build.gradle.kts @@ -84,7 +84,7 @@ android { compileSdk = 35 defaultConfig { - minSdk = 24 + minSdk = 26 } packaging { diff --git a/mifospay-shared/src/commonMain/composeResources/values/strings.xml b/cmp-shared/src/commonMain/composeResources/values/strings.xml similarity index 100% rename from mifospay-shared/src/commonMain/composeResources/values/strings.xml rename to cmp-shared/src/commonMain/composeResources/values/strings.xml diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/MifosPayApp.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/MifosPayApp.kt similarity index 100% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/MifosPayApp.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/MifosPayApp.kt diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/MifosPayViewModel.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/MifosPayViewModel.kt similarity index 100% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/MifosPayViewModel.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/MifosPayViewModel.kt diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/di/KoinModules.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/di/KoinModules.kt similarity index 100% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/di/KoinModules.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/di/KoinModules.kt diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/LoginNavGraph.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/LoginNavGraph.kt similarity index 100% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/LoginNavGraph.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/LoginNavGraph.kt diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavGraph.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavGraph.kt similarity index 100% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavGraph.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavGraph.kt diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt similarity index 100% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/MifosNavHost.kt diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/PasscodeNavGraph.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/PasscodeNavGraph.kt similarity index 100% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/PasscodeNavGraph.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/PasscodeNavGraph.kt diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/RootNavGraph.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/RootNavGraph.kt similarity index 100% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/RootNavGraph.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/navigation/RootNavGraph.kt diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt similarity index 98% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt index 03397f06..b80dcff7 100644 --- a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt +++ b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosApp.kt @@ -46,8 +46,8 @@ import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavDestination import androidx.navigation.NavDestination.Companion.hierarchy -import mobile_wallet.mifospay_shared.generated.resources.Res -import mobile_wallet.mifospay_shared.generated.resources.not_connected +import mobile_wallet.cmp_shared.generated.resources.Res +import mobile_wallet.cmp_shared.generated.resources.not_connected import org.jetbrains.compose.resources.stringResource import org.mifospay.core.data.util.NetworkMonitor import org.mifospay.core.data.util.TimeZoneMonitor diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosAppState.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosAppState.kt similarity index 100% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosAppState.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/ui/MifosAppState.kt diff --git a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/utils/TopLevelDestination.kt b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/utils/TopLevelDestination.kt similarity index 81% rename from mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/utils/TopLevelDestination.kt rename to cmp-shared/src/commonMain/kotlin/org/mifospay/shared/utils/TopLevelDestination.kt index 907fb009..0d927e7f 100644 --- a/mifospay-shared/src/commonMain/kotlin/org/mifospay/shared/utils/TopLevelDestination.kt +++ b/cmp-shared/src/commonMain/kotlin/org/mifospay/shared/utils/TopLevelDestination.kt @@ -10,12 +10,12 @@ package org.mifospay.shared.utils import androidx.compose.ui.graphics.vector.ImageVector -import mobile_wallet.mifospay_shared.generated.resources.Res -import mobile_wallet.mifospay_shared.generated.resources.app_name -import mobile_wallet.mifospay_shared.generated.resources.finance -import mobile_wallet.mifospay_shared.generated.resources.home -import mobile_wallet.mifospay_shared.generated.resources.payments -import mobile_wallet.mifospay_shared.generated.resources.profile +import mobile_wallet.cmp_shared.generated.resources.Res +import mobile_wallet.cmp_shared.generated.resources.app_name +import mobile_wallet.cmp_shared.generated.resources.finance +import mobile_wallet.cmp_shared.generated.resources.home +import mobile_wallet.cmp_shared.generated.resources.payments +import mobile_wallet.cmp_shared.generated.resources.profile import org.jetbrains.compose.resources.StringResource import org.mifospay.core.designsystem.icon.MifosIcons diff --git a/mifospay-shared/src/iosMain/kotlin/MifosViewController.kt b/cmp-shared/src/iosMain/kotlin/MifosViewController.kt similarity index 100% rename from mifospay-shared/src/iosMain/kotlin/MifosViewController.kt rename to cmp-shared/src/iosMain/kotlin/MifosViewController.kt diff --git a/mifospay-shared/src/nativeMain/kotlin/org/mifospay/shared/MifosViewController.kt b/cmp-shared/src/nativeMain/kotlin/org/mifospay/shared/MifosViewController.kt similarity index 100% rename from mifospay-shared/src/nativeMain/kotlin/org/mifospay/shared/MifosViewController.kt rename to cmp-shared/src/nativeMain/kotlin/org/mifospay/shared/MifosViewController.kt diff --git a/mifospay-web/.gitignore b/cmp-web/.gitignore similarity index 100% rename from mifospay-web/.gitignore rename to cmp-web/.gitignore diff --git a/mifospay-web/README.md b/cmp-web/README.md similarity index 100% rename from mifospay-web/README.md rename to cmp-web/README.md diff --git a/mifospay-web/build.gradle.kts b/cmp-web/build.gradle.kts similarity index 96% rename from mifospay-web/build.gradle.kts rename to cmp-web/build.gradle.kts index e3dbc3f2..4232fd9f 100644 --- a/mifospay-web/build.gradle.kts +++ b/cmp-web/build.gradle.kts @@ -34,7 +34,7 @@ kotlin { val jsWasmMain by creating { dependsOn(commonMain.get()) dependencies { - implementation(projects.mifospayShared) + implementation(projects.cmpShared) implementation(projects.core.common) implementation(projects.core.data) implementation(projects.core.model) diff --git a/mifospay-web/src/jsMain/kotlin/Application.kt b/cmp-web/src/jsMain/kotlin/Application.kt similarity index 100% rename from mifospay-web/src/jsMain/kotlin/Application.kt rename to cmp-web/src/jsMain/kotlin/Application.kt diff --git a/mifospay-web/src/jsMain/resources/favicon.ico b/cmp-web/src/jsMain/resources/favicon.ico similarity index 100% rename from mifospay-web/src/jsMain/resources/favicon.ico rename to cmp-web/src/jsMain/resources/favicon.ico diff --git a/mifospay-web/src/jsMain/resources/index.html b/cmp-web/src/jsMain/resources/index.html similarity index 100% rename from mifospay-web/src/jsMain/resources/index.html rename to cmp-web/src/jsMain/resources/index.html diff --git a/mifospay-web/src/jsMain/resources/styles.css b/cmp-web/src/jsMain/resources/styles.css similarity index 100% rename from mifospay-web/src/jsMain/resources/styles.css rename to cmp-web/src/jsMain/resources/styles.css diff --git a/mifospay-web/src/wasmJsMain/kotlin/Main.kt b/cmp-web/src/wasmJsMain/kotlin/Main.kt similarity index 100% rename from mifospay-web/src/wasmJsMain/kotlin/Main.kt rename to cmp-web/src/wasmJsMain/kotlin/Main.kt diff --git a/mifospay-web/src/wasmJsMain/resources/favicon.ico b/cmp-web/src/wasmJsMain/resources/favicon.ico similarity index 100% rename from mifospay-web/src/wasmJsMain/resources/favicon.ico rename to cmp-web/src/wasmJsMain/resources/favicon.ico diff --git a/mifospay-web/src/wasmJsMain/resources/index.html b/cmp-web/src/wasmJsMain/resources/index.html similarity index 100% rename from mifospay-web/src/wasmJsMain/resources/index.html rename to cmp-web/src/wasmJsMain/resources/index.html diff --git a/mifospay-web/src/webpack.config.d/cleanupSourcemap.js b/cmp-web/src/webpack.config.d/cleanupSourcemap.js similarity index 100% rename from mifospay-web/src/webpack.config.d/cleanupSourcemap.js rename to cmp-web/src/webpack.config.d/cleanupSourcemap.js diff --git a/fastlane-config/ios_config.rb b/fastlane-config/ios_config.rb index 862a88da..704c29ab 100644 --- a/fastlane-config/ios_config.rb +++ b/fastlane-config/ios_config.rb @@ -7,9 +7,9 @@ module FastlaneConfig } BUILD_CONFIG = { - project_path: "mifospay-ios/iosApp.xcodeproj", + project_path: "cmp-ios/iosApp.xcodeproj", scheme: "iosApp", - output_directory: "mifospay-ios/build" + output_directory: "cmp-ios/build" } end end \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2d73d3c7..1375346c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ accompanist = "0.36.0" # Android androidDesugarJdkLibs = "2.1.5" -androidGradlePlugin = "8.7.3" +androidGradlePlugin = "8.11.1" androidTools = "31.11.1" # AndroidX Dependencies @@ -82,12 +82,12 @@ kotlinxCoroutines = "1.9.0" kotlinxDatetime = "0.6.1" kotlinxImmutable = "0.3.8" kotlinxSerializationJson = "1.7.3" -ksp = "2.1.20-1.0.32" +ksp = "2.1.20-2.0.1" # Ktor & Ktorfit ktorVersion = "3.1.2" -ktorfit = "2.5.0" -ktorfitKsp = "2.5.0" +ktorfit = "2.5.2" +ktorfitKsp = "2.5.1" # Koin CMP Dependencies koin = "4.1.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69698329..c3288670 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Nov 23 22:26:32 IST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mifospay-ios/iosApp.xcodeproj/project.xcworkspace/xcuserdata/kapilmaurya.xcuserdatad/UserInterfaceState.xcuserstate b/mifospay-ios/iosApp.xcodeproj/project.xcworkspace/xcuserdata/kapilmaurya.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index ffa0bd0e..00000000 Binary files a/mifospay-ios/iosApp.xcodeproj/project.xcworkspace/xcuserdata/kapilmaurya.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/settings.gradle.kts b/settings.gradle.kts index 01128d4d..dd2bd703 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -35,10 +35,10 @@ rootProject.name = "mobile-wallet" enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") -include(":mifospay-shared") -include(":mifospay-android") -include(":mifospay-desktop") -include(":mifospay-web") +include(":cmp-shared") +include(":cmp-android") +include(":cmp-desktop") +include(":cmp-web") include(":core:data") include(":core:domain")