Revert "feat: added application modules"

This reverts commit f31a0b6.
openMF · Feb 6, 2025 · fcff923 · fcff923
1 parent fd8f333
commit fcff923
Show file tree

Hide file tree

Showing 153 changed files with 987 additions and 4,249 deletions.
diff --git a/.github/actions/create-release-notes/action.yml b/.github/actions/create-release-notes/action.yml
@@ -41,16 +41,16 @@ runs:
       id: version-generator
       shell: bash
       run: |
-        mkdir -p ./cmp-android/build/outputs/
+        mkdir -p ./androidApp/build/outputs/
         
         echo "Previous Release Tag:"
         echo "${{ steps.latest-release-tag.outputs.result }}"
         
         echo "Full Changelog:"
         CHANGELOG="${{ steps.generate-notes.outputs.result }}"
         echo -e "$CHANGELOG"
-        printf "$CHANGELOG" > ./cmp-android/build/outputs/changelogGithub
+        printf "$CHANGELOG" > ./androidApp/build/outputs/changelogGithub
 
         echo "Beta Changelog:"
         git log --format="* %s" HEAD^..HEAD
-        git log --format="* %s" HEAD^..HEAD > ./cmp-android/build/outputs/changelogBeta
+        git log --format="* %s" HEAD^..HEAD > ./androidApp/build/outputs/changelogBeta
diff --git a/.github/actions/inflate-secrets/action.yml b/.github/actions/inflate-secrets/action.yml
@@ -16,21 +16,21 @@ runs:
     - name: Mock debug google-services.json
       shell: bash
       run: |
-        cp .github/mock-google-services.json cmp-android/google-services.json
+        cp .github/mock-google-services.json androidApp/google-services.json
 
     - name: Inflate release_keystore.keystore
       shell: bash
       env:
         KEYSTORE: ${{ inputs.keystore }}
       run: | 
-        echo $KEYSTORE | base64 --decode > cmp-android/release_keystore.keystore
+        echo $KEYSTORE | base64 --decode > androidApp/release_keystore.keystore
 
     - name: Inflate google-services.json
       shell: bash
       env:
         GOOGLE_SERVICES: ${{ inputs.google-services }}
       run: |
-        echo $GOOGLE_SERVICES > cmp-android/google-services.json
+        echo $GOOGLE_SERVICES > androidApp/google-services.json
 
     - name: Inflate playStorePublishServiceCredentialsFile.json
       shell: bash

diff --git a/.github/workflows/master_dev_ci.yml b/.github/workflows/master_dev_ci.yml
@@ -99,7 +99,7 @@ jobs:
         id: dependencyguard_baseline
         if: steps.dependencyguard_verify.outcome == 'failure' && github.event_name == 'pull_request'
         run: |
-          ./gradlew :cmp-android:dependencyGuard
+          ./gradlew :mifos-android:dependencyGuard
 
       - name: Push new Dependency Guard baselines if available
         uses: stefanzweifel/git-auto-commit-action@v5
@@ -122,7 +122,7 @@ jobs:
 
       - name: Run tests
         run: |
-          ./gradlew :cmp-android:testDemoDebug
+          ./gradlew :mifos-android:testDemoDebug
 #          ./gradlew testDebug :lint:test :androidApp:lintRelease :lint:lint
 
       - name: Upload reports
@@ -177,7 +177,7 @@ jobs:
           java-version: 17
 
       - name: Build APKs
-        run: ./gradlew :cmp-android:assembleDemoDebug
+        run: ./gradlew :mifos-android:assembleDemoDebug
 
       - name: Upload APKs
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/release_to_internal_or_beta.yml b/.github/workflows/release_to_internal_or_beta.yml
@@ -65,7 +65,7 @@ jobs:
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS_PASSWORD }}
           VERSION_CODE: ${{ steps.rel_number.outputs.version-code }}
         run: |
-          ./gradlew :cmp-android:assembleRelease
+          ./gradlew :androidApp:assembleRelease
 
       - name: Archive Build
         uses: actions/upload-artifact@v4
@@ -89,8 +89,8 @@ jobs:
           draft: false
           prerelease: true
           files: |
-            ./cmp-android/build/outputs/apk/release/androidApp-release.apk
-            ./cmp-android/build/outputs/version_code.txt
+            ./androidApp/build/outputs/apk/release/androidApp-release.apk
+            ./androidApp/build/outputs/version_code.txt
 
       - name: Print `git status`
         run: git status
@@ -152,7 +152,7 @@ jobs:
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_ALIAS_PASSWORD }}
           VERSION_CODE: ${{ steps.rel_number.outputs.version-code }}
         run: |
-          ./gradlew :cmp-android:bundleRelease
+          ./gradlew :androidApp:bundleRelease
 
       - name: Deploy to Play Store Internal
         run: bundle exec fastlane android deploy_internal

diff --git a/.run/cmp-desktop.run.xml b/.run/cmp-desktop.run.xml
diff --git a/.run/cmp-web-js.run.xml b/.run/cmp-web-js.run.xml
diff --git a/.run/cmp-web-wasm.run.xml b/.run/cmp-web-wasm.run.xml
diff --git a/.run/mifospay-android.run.xml b/.run/mifospay-android.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="cmp-android" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-        <module name="mifos-mobile.cmp-android.main" />
+    <configuration default="false" name="androidApp" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+        <module name="mobile-wallet.mifospay-android.main" />
         <option name="DEPLOY" value="true" />
         <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
         <option name="DEPLOY_AS_INSTANT" value="false" />

diff --git a/.run/mifospay-desktop.run.xml b/.run/mifospay-desktop.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="mifospay-desktop" type="GradleRunConfiguration" factoryName="Gradle">
+        <ExternalSystemSettings>
+            <option name="executionName" />
+            <option name="externalProjectPath" value="$PROJECT_DIR$" />
+            <option name="externalSystemIdString" value="GRADLE" />
+            <option name="scriptParameters" value="-DmainClass=MainKt --quiet" />
+            <option name="taskDescriptions">
+                <list />
+            </option>
+            <option name="taskNames">
+                <list>
+                    <option value=":mifospay-desktop:desktopRun" />
+                </list>
+            </option>
+            <option name="vmOptions" />
+        </ExternalSystemSettings>
+        <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+        <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+        <DebugAllEnabled>false</DebugAllEnabled>
+        <RunAsTest>false</RunAsTest>
+        <method v="2" />
+    </configuration>
+</component>
diff --git a/.run/mifospay-web-js.run.xml b/.run/mifospay-web-js.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="mifospay-web-js" type="GradleRunConfiguration" factoryName="Gradle">
+        <ExternalSystemSettings>
+            <option name="executionName" />
+            <option name="externalProjectPath" value="$PROJECT_DIR$" />
+            <option name="externalSystemIdString" value="GRADLE" />
+            <option name="scriptParameters" value="" />
+            <option name="taskDescriptions">
+                <list />
+            </option>
+            <option name="taskNames">
+                <list>
+                    <option value=":mifospay-web:jsBrowserRun" />
+                </list>
+            </option>
+            <option name="vmOptions" />
+        </ExternalSystemSettings>
+        <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+        <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+        <DebugAllEnabled>false</DebugAllEnabled>
+        <RunAsTest>false</RunAsTest>
+        <method v="2" />
+    </configuration>
+</component>
diff --git a/.run/mifospay-web-wasm.run.xml b/.run/mifospay-web-wasm.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="mifospay-web-wasm" type="GradleRunConfiguration" factoryName="Gradle">
+        <ExternalSystemSettings>
+            <option name="executionName" />
+            <option name="externalProjectPath" value="$PROJECT_DIR$" />
+            <option name="externalSystemIdString" value="GRADLE" />
+            <option name="scriptParameters" value="" />
+            <option name="taskDescriptions">
+                <list />
+            </option>
+            <option name="taskNames">
+                <list>
+                    <option value=":mifospay-web:wasmJsBrowserRun" />
+                </list>
+            </option>
+            <option name="vmOptions" />
+        </ExternalSystemSettings>
+        <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+        <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+        <DebugAllEnabled>false</DebugAllEnabled>
+        <RunAsTest>false</RunAsTest>
+        <method v="2" />
+    </configuration>
+</component>
diff --git a/cmp-android/.gitignore → androidApp/.gitignore b/cmp-android/.gitignore → androidApp/.gitignore
diff --git a/cmp-android/README.md → androidApp/README.md b/cmp-android/README.md → androidApp/README.md
diff --git a/cmp-android/build.gradle.kts → androidApp/build.gradle.kts b/cmp-android/build.gradle.kts → androidApp/build.gradle.kts
@@ -73,7 +73,7 @@ dependencyGuard {
 
 dependencies {
 
-    implementation (projects.cmpShared)
+    implementation (projects.shared)
 
     implementation(projects.core.logs)
     implementation(projects.core.common)
@@ -83,7 +83,6 @@ dependencies {
     implementation(projects.core.ui)
     implementation(projects.core.designsystem)
 
-    implementation(projects.feature.auth)
 //    implementation(projects.feature.loan)
 //    implementation(projects.feature.beneficiary)
 //    implementation(projects.feature.guarantor)
@@ -101,6 +100,7 @@ dependencies {
 //    implementation(projects.feature.settings)
 //    implementation(projects.feature.updatePassword)
 //    implementation(projects.feature.home)
+    implementation(projects.feature.auth)
 //    implementation(projects.feature.userProfile)
 
 //    implementation(projects.libs.mifosPasscode)
@@ -125,12 +125,7 @@ dependencies {
     implementation(libs.androidx.tracing.ktx)
     implementation(libs.androidx.profileinstaller)
     implementation(libs.google.oss.licenses)
-//    implementation(libs.androidx.multidex)
-
-    implementation(libs.koin.core)
-    implementation(libs.koin.android)
-    implementation(libs.koin.compose)
-    implementation(libs.koin.compose.viewmodel)
+    implementation(libs.androidx.multidex)
 
 //    testImplementation(projects.core.testing)
 //    testImplementation(libs.hilt.android.testing)

diff --git a/cmp-android/debug_keystore.jks → androidApp/debug_keystore.jks b/cmp-android/debug_keystore.jks → androidApp/debug_keystore.jks
diff --git a/...ependencies/demoDebugRuntimeClasspath.txt → ...ependencies/demoDebugRuntimeClasspath.txt b/...ependencies/demoDebugRuntimeClasspath.txt → ...ependencies/demoDebugRuntimeClasspath.txt
@@ -92,6 +92,7 @@ androidx.lifecycle:lifecycle-viewmodel:2.8.7
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.metrics:metrics-performance:1.0.0-beta01
+androidx.multidex:multidex:2.0.1
 androidx.navigation:navigation-common-ktx:2.8.4
 androidx.navigation:navigation-common:2.8.4
 androidx.navigation:navigation-compose:2.8.4
@@ -210,20 +211,20 @@ io.github.vinceglb:filekit-compose-android:0.8.7
 io.github.vinceglb:filekit-compose:0.8.7
 io.github.vinceglb:filekit-core-android:0.8.7
 io.github.vinceglb:filekit-core:0.8.7
-io.insert-koin:koin-android:4.0.2
-io.insert-koin:koin-androidx-compose:4.0.2
-io.insert-koin:koin-androidx-navigation:4.0.2
+io.insert-koin:koin-android:4.0.1-RC1
+io.insert-koin:koin-androidx-compose:4.0.1-RC1
+io.insert-koin:koin-androidx-navigation:4.0.1-RC1
 io.insert-koin:koin-annotations-jvm:1.4.0-RC4
 io.insert-koin:koin-annotations:1.4.0-RC4
-io.insert-koin:koin-bom:4.0.2
-io.insert-koin:koin-compose-jvm:4.0.2
-io.insert-koin:koin-compose-viewmodel-jvm:4.0.2
-io.insert-koin:koin-compose-viewmodel:4.0.2
-io.insert-koin:koin-compose:4.0.2
-io.insert-koin:koin-core-jvm:4.0.2
-io.insert-koin:koin-core-viewmodel-jvm:4.0.2
-io.insert-koin:koin-core-viewmodel:4.0.2
-io.insert-koin:koin-core:4.0.2
+io.insert-koin:koin-bom:4.0.1-RC1
+io.insert-koin:koin-compose-jvm:4.0.1-RC1
+io.insert-koin:koin-compose-viewmodel-jvm:4.0.1-RC1
+io.insert-koin:koin-compose-viewmodel:4.0.1-RC1
+io.insert-koin:koin-compose:4.0.1-RC1
+io.insert-koin:koin-core-jvm:4.0.1-RC1
+io.insert-koin:koin-core-viewmodel-jvm:4.0.1-RC1
+io.insert-koin:koin-core-viewmodel:4.0.1-RC1
+io.insert-koin:koin-core:4.0.1-RC1
 io.ktor:ktor-client-auth-jvm:3.0.3
 io.ktor:ktor-client-auth:3.0.3
 io.ktor:ktor-client-content-negotiation-jvm:3.0.3
@@ -292,13 +293,13 @@ org.jetbrains.compose.runtime:runtime:1.7.3
 org.jetbrains.compose.ui:ui-geometry:1.7.0-rc01
 org.jetbrains.compose.ui:ui-graphics:1.7.0-rc01
 org.jetbrains.compose.ui:ui-text:1.7.0-rc01
+org.jetbrains.compose.ui:ui-tooling-preview:1.7.0-rc01
 org.jetbrains.compose.ui:ui-unit:1.7.0-rc01
 org.jetbrains.compose.ui:ui-util:1.7.0-rc01
 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-reflect:2.1.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22
 org.jetbrains.kotlin:kotlin-stdlib:2.1.0