From 1c87699fcff03038e404210e3ffcbbf84505b2a2 Mon Sep 17 00:00:00 2001 From: Hekmatullah Date: Fri, 5 Sep 2025 09:33:31 +0100 Subject: [PATCH] fix(core-base,android-config): correct time import and update android_config.rb (#1917) --- README.md | 10 +++++----- cmp-android/README.md | 8 ++++---- .../prodReleaseRuntimeClasspath.tree.txt | 4 ++-- .../dependencies/prodReleaseRuntimeClasspath.txt | 4 ++-- cmp-desktop/README.md | 12 ++++++------ cmp-desktop/build.gradle.kts | 8 +++++++- .../core/base/analytics/AnalyticsExtensions.kt | 2 +- .../core/base/analytics/PerformanceTracker.kt | 2 +- fastlane-config/android_config.rb | 6 +++--- fastlane/FastFile | 1 + gradle/libs.versions.toml | 2 +- 11 files changed, 33 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 635b0461..768803ad 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,13 @@ Following recommended architecture and design patterns, the application is devel ### Run the Project ![Screenshot (154)](https://github.com/user-attachments/assets/761063ed-83f8-4443-b58f-2b68a4c74c5d) -- **Android App**: Select the `mifospay-android` run configuration and click **Run**. -- **Desktop App**: Select the `mifospay-desktop` run configuration and click **Run**. -- **Web App (JavaScript)**: Select the `mifospasy-web-js` run configuration and click **Run**. -- **iOS App**: Select the `mifospay-ios` run configuration and click **Run**. +- **Android App**: Select the `cmp-android` run configuration and click **Run**. +- **Desktop App**: Select the `cmp-desktop` run configuration and click **Run**. +- **Web App (JavaScript)**: Select the `cmp-web-js` run configuration and click **Run**. +- **iOS App**: Select the `cmp-ios` run configuration and click **Run**. > \[!Important] -> To run the iOS app, you must have a macOS device with Xcode installed. Currently, the `mifospay-web-wasm` app is not working as expected. We are working on it and it will be available soon. +> To run the iOS app, you must have a macOS device with Xcode installed. Currently, the `cmp-web-wasm` app is not working as expected. We are working on it and it will be available soon. ### Demo Credentials - **Fineract Instance**: `venus.mifos.community` diff --git a/cmp-android/README.md b/cmp-android/README.md index 7ede3edd..a6442a2b 100644 --- a/cmp-android/README.md +++ b/cmp-android/README.md @@ -12,10 +12,10 @@ graph LR :core:data["data"] :core:ui["ui"] end - :mifospay-android --> :mifospay-shared - :mifospay-android --> :core:data - :mifospay-android --> :core:ui + :cmp-android --> :mifospay-shared + :cmp-android --> :core:data + :cmp-android --> :core:ui ``` -# :mifospay-android module +# :cmp-android module ## Dependency graph ![Dependency graph](../docs/images/graphs-kmp/dep_graph_mifospay_android.svg) diff --git a/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt b/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt index 71423e10..3b09be23 100644 --- a/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt +++ b/cmp-android/dependencies/prodReleaseRuntimeClasspath.tree.txt @@ -1404,8 +1404,8 @@ | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 -> 2.1.21 (*) | | | +--- com.squareup.okio:okio:3.15.0 (*) | | | +--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.1.21 (*) -| | | +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.1 -| | | | \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1 +| | | +--- org.jetbrains.kotlinx:kotlinx-datetime:0.6.2 +| | | | \--- org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2 | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.21 -> 2.1.21 (*) | | | +--- io.insert-koin:koin-bom:4.1.0 (*) | | | +--- io.insert-koin:koin-core:4.1.0 (*) diff --git a/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt b/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt index 2bde1f00..018e0499 100644 --- a/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt +++ b/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt @@ -428,8 +428,8 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2 org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.2 org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2 -org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.1 -org.jetbrains.kotlinx:kotlinx-datetime:0.6.1 +org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2 +org.jetbrains.kotlinx:kotlinx-datetime:0.6.2 org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.7.0 org.jetbrains.kotlinx:kotlinx-io-bytestring:0.7.0 org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.7.0 diff --git a/cmp-desktop/README.md b/cmp-desktop/README.md index c294688b..9ac3ec0e 100644 --- a/cmp-desktop/README.md +++ b/cmp-desktop/README.md @@ -14,12 +14,12 @@ graph LR :core:model["model"] :core:datastore["datastore"] end - :mifospay-desktop --> :core:common - :mifospay-desktop --> :core:data - :mifospay-desktop --> :core:model - :mifospay-desktop --> :core:datastore - :mifospay-desktop --> :mifospay-shared + :cmp-desktop --> :core:common + :cmp-desktop --> :core:data + :cmp-desktop --> :core:model + :cmp-desktop --> :core:datastore + :cmp-desktop --> :mifospay-shared ``` -# :mifospay-desktop module +# :cmp-desktop module ## Dependency graph ![Dependency graph](../docs/images/graphs-kmp/dep_graph_mifospay_desktop.svg) diff --git a/cmp-desktop/build.gradle.kts b/cmp-desktop/build.gradle.kts index fff0b489..51fa969e 100644 --- a/cmp-desktop/build.gradle.kts +++ b/cmp-desktop/build.gradle.kts @@ -54,7 +54,13 @@ compose.desktop { (project.findProperty("macOsAppStoreRelease") as String?)?.toBoolean() ?: false nativeDistributions { - targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Exe, TargetFormat.Deb) + targetFormats( + TargetFormat.Pkg, + TargetFormat.Dmg, + TargetFormat.Msi, + TargetFormat.Exe, + TargetFormat.Deb + ) packageName = appPackageName packageVersion = appPackageVersion description = "Mifos Wallet Desktop Application" diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsExtensions.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsExtensions.kt index 04dd064f..1941cdd6 100644 --- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsExtensions.kt +++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsExtensions.kt @@ -9,7 +9,7 @@ */ package template.core.base.analytics -import kotlin.time.Clock +import kotlinx.datetime.Clock import kotlin.time.Duration import kotlin.time.DurationUnit diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/PerformanceTracker.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/PerformanceTracker.kt index 1f33b9e9..535e1088 100644 --- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/PerformanceTracker.kt +++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/PerformanceTracker.kt @@ -9,7 +9,7 @@ */ package template.core.base.analytics -import kotlin.time.Clock +import kotlinx.datetime.Clock /** Performance tracking utilities for analytics */ diff --git a/fastlane-config/android_config.rb b/fastlane-config/android_config.rb index d1a1fb20..f59b663a 100644 --- a/fastlane-config/android_config.rb +++ b/fastlane-config/android_config.rb @@ -15,9 +15,9 @@ module FastlaneConfig } BUILD_PATHS = { - prod_apk_path: "mifospay-android/build/outputs/apk/prod/release/mifospay-android-prod-release.apk", - demo_apk_path: "mifospay-android/build/outputs/apk/demo/release/mifospay-android-demo-release.apk", - prod_aab_path: "mifospay-android/build/outputs/bundle/prodRelease/mifospay-android-prod-release.aab" + prod_apk_path: "cmp-android/build/outputs/apk/prod/release/mifospay-android-prod-release.apk", + demo_apk_path: "cmp-android/build/outputs/apk/demo/release/mifospay-android-demo-release.apk", + prod_aab_path: "cmp-android/build/outputs/bundle/prodRelease/mifospay-android-prod-release.aab" } end end \ No newline at end of file diff --git a/fastlane/FastFile b/fastlane/FastFile index 1e6303a1..5626a4dc 100644 --- a/fastlane/FastFile +++ b/fastlane/FastFile @@ -559,6 +559,7 @@ platform :ios do ) deliver( + screenshots_path: ios_config[:screenshots_ios_path], metadata_path: options[:metadata_path] || ios_config[:metadata_path], submit_for_review: false, # Set to true if you want to auto-submit for review automatic_release: true, # Set to true if you want to auto-release once it approved diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 409cf569..3b2edd5b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -85,7 +85,7 @@ firebasePerfPlugin = "1.4.2" kotlin = "2.1.20" kotlinInject = "0.7.2" kotlinxCoroutines = "1.9.0" -kotlinxDatetime = "0.6.1" +kotlinxDatetime = "0.6.2" kotlinxImmutable = "0.3.8" kotlinxSerializationJson = "1.8.1" ksp = "2.1.20-2.0.1"