From fcff923a6d2095d6f90cf8c793d0ff2da1f34e34 Mon Sep 17 00:00:00 2001 From: Nagarjuna Date: Thu, 6 Feb 2025 10:24:07 +0530 Subject: [PATCH] Revert "feat: added application modules" This reverts commit f31a0b677ea2dce4eb0d24249f0d167c99c1ad3a. --- .../actions/create-release-notes/action.yml | 6 +- .github/actions/inflate-secrets/action.yml | 6 +- .github/workflows/master_dev_ci.yml | 6 +- .../workflows/release_to_internal_or_beta.yml | 8 +- .run/cmp-desktop.run.xml | 24 - .run/cmp-web-js.run.xml | 24 - .run/cmp-web-wasm.run.xml | 24 - .run/mifospay-android.run.xml | 4 +- .run/mifospay-desktop.run.xml | 24 + .run/mifospay-web-js.run.xml | 24 + .run/mifospay-web-wasm.run.xml | 24 + {cmp-android => androidApp}/.gitignore | 0 {cmp-android => androidApp}/README.md | 0 {cmp-android => androidApp}/build.gradle.kts | 11 +- .../debug_keystore.jks | Bin .../demoDebugRuntimeClasspath.txt | 27 +- .../demoReleaseRuntimeClasspath.txt | 27 +- .../prodDebugRuntimeClasspath.txt | 27 +- .../prodReleaseRuntimeClasspath.txt | 27 +- .../releaseRuntimeClasspath.tree.txt | 0 .../dependencies/releaseRuntimeClasspath.txt | 0 {cmp-android => androidApp}/fabric.properties | 0 .../google-services.json | 0 {cmp-android => androidApp}/lint-baseline.xml | 0 .../proguard-rules.pro | 0 .../release-badging.txt | 0 .../org/mifos/mobile/ApplicationTest.kt | 0 .../src/main/AndroidManifest.xml | 4 +- .../src/main/ic_launcher-playstore.png | Bin .../kotlin/org/mifos/mobile/HomeActivity.kt | 115 + .../org/mifos/mobile/HomeActivityViewModel.kt | 32 +- .../org/mifos/mobile/MifosSelfServiceApp.kt | 25 + .../mifos/mobile}/navigation/MifosNavGraph.kt | 2 +- .../mifos/mobile/navigation/MifosNavHost.kt | 281 ++ .../mobile/navigation/PasscodeNavGraph.kt | 42 + .../mifos/mobile}/navigation/RootNavGraph.kt | 17 +- .../kotlin/org/mifos/mobile/ui/MifosApp.kt | 27 +- .../org/mifos/mobile}/ui/MifosMobileState.kt | 4 +- .../src/main/res/drawable/mifos_logo.png | Bin .../res/drawable/mifos_splash_screen_logo.png | Bin .../src/main/res/drawable/splash_icon.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin .../mipmap-hdpi/ic_launcher_foreground.webp | Bin .../res/mipmap-hdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin .../mipmap-mdpi/ic_launcher_foreground.webp | Bin .../res/mipmap-mdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin .../mipmap-xhdpi/ic_launcher_foreground.webp | Bin .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin .../mipmap-xxhdpi/ic_launcher_foreground.webp | Bin .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin .../ic_launcher_foreground.webp | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin .../src/main/res/values-ar/strings.xml | 0 .../src/main/res/values-bn/strings.xml | 0 .../src/main/res/values-es/strings.xml | 0 .../src/main/res/values-fa-rAF/strings.xml | 0 .../src/main/res/values-fr/strings.xml | 0 .../src/main/res/values-hi/strings.xml | 0 .../src/main/res/values-in/strings.xml | 0 .../src/main/res/values-km/strings.xml | 0 .../src/main/res/values-kn/strings.xml | 0 .../src/main/res/values-my/strings.xml | 0 .../src/main/res/values-pl/strings.xml | 0 .../src/main/res/values-pt/strings.xml | 0 .../src/main/res/values-ru/strings.xml | 0 .../src/main/res/values-sw/strings.xml | 0 .../src/main/res/values-te/strings.xml | 0 .../src/main/res/values-ur/strings.xml | 0 .../src/main/res/values/colors.xml | 0 .../res/values/ic_launcher_background.xml | 0 .../src/main/res/values/splash.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/xml/fileproviderpath.xml | 0 .../src/release/res/values/api_keys.xml | 0 ci-prepush.bat | 4 +- .../kotlin/org/mifos/mobile/AndroidApp.kt | 29 - .../kotlin/org/mifos/mobile/MainActivity.kt | 71 - cmp-desktop/.gitignore | 1 - cmp-desktop/build.gradle.kts | 84 - cmp-desktop/icons/ic_launcher.icns | Bin 169178 -> 0 bytes cmp-desktop/icons/ic_launcher.ico | Bin 40718 -> 0 bytes cmp-desktop/icons/ic_launcher.png | Bin 33661 -> 0 bytes cmp-desktop/proguard-rules.pro | 21 - cmp-desktop/src/desktopMain/kotlin/main.kt | 19 - .../composeResources/values/strings.xml | 13 - .../mobile/shared/MifosMobileSharedApp.kt | 69 - .../org/mifos/mobile/shared/di/KoinModules.kt | 68 - .../mobile/shared/navigation/MifosNavHost.kt | 275 -- .../shared/navigation/PasscodeNavGraph.kt | 42 - .../mifos/mobile/shared/MainViewController.kt | 22 - .../mifos/mobile/shared/di/Modules.native.kt | 15 - .../mobile/shared/MifosViewController.kt | 22 - cmp-web/.gitignore | 1 - cmp-web/build.gradle.kts | 65 - cmp-web/proguard-rules.pro | 21 - cmp-web/src/jsMain/kotlin/Application.kt | 17 - cmp-web/src/jsMain/resources/favicon.ico | Bin 40718 -> 0 bytes cmp-web/src/jsMain/resources/index.html | 43 - cmp-web/src/jsMain/resources/styles.css | 14 - cmp-web/src/wasmJsMain/kotlin/Main.kt | 21 - cmp-web/src/wasmJsMain/resources/favicon.ico | Bin 40718 -> 0 bytes cmp-web/src/wasmJsMain/resources/index.html | 13 - core/data/build.gradle.kts | 2 +- .../mobile/core/data/di/RepositoryModule.kt | 2 +- .../mobile/core/model/Parcelize.android.kt | 3 - .../org/mifos/mobile/core/model/Parcelize.kt | 2 +- .../mobile/core/model/Parcelize.desktop.kt | 2 - .../mifos/mobile/core/model/Parcelize.js.kt | 2 - .../mobile/core/model/Parcelize.native.kt | 2 - .../mobile/core/model/Parcelize.wasmJs.kt | 2 - .../mobile/core/network/di/NetworkModule.kt | 2 +- .../mifos/mobile/core/network/di/Qualifier.kt | 1 + fastlane/AppFile | 2 +- .../mobile/feature/auth/login/LoginScreen.kt | 11 +- .../feature/auth/login/LoginViewModel.kt | 5 - .../auth/navigation/AuthenticationNavGraph.kt | 6 +- .../auth/registration/RegistrationScreen.kt | 37 +- .../RegistrationVerificationScreen.kt | 73 +- .../RegistrationVerificationViewModel.kt | 75 +- .../registration/RegistrationViewModel.kt | 131 +- gradle/libs.versions.toml | 4 +- .../iosApp.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../UserInterfaceState.xcuserstate | Bin .../xcschemes/xcschememanagement.plist | 0 .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../iosApp/Assets.xcassets/Contents.json | 0 {cmp-ios => iosApp}/iosApp/ContentView.swift | 0 .../Preview Assets.xcassets/Contents.json | 0 {cmp-ios => iosApp}/iosApp/iosAppApp.swift | 0 kotlin-js-store/yarn.lock | 2897 ----------------- settings.gradle.kts | 16 +- {cmp-shared => shared}/README.md | 0 {cmp-shared => shared}/build.gradle.kts | 32 +- .../org/mifos/mobile/shared/MainActivity.kt | 23 + .../org/mifos/mobile/shared/MyApplication.kt | 15 + .../mifos/mobile/shared/Platform.android.kt | 7 + .../mifos/mobile/shared/di/Modules.android.kt | 6 + .../kotlin/org/mifos/mobile/shared/App.kt | 29 + .../org/mifos/mobile/shared/Platform.kt | 7 + .../org/mifos/mobile/shared/di/Modules.kt | 10 + .../org/mifos/mobile/shared/di/initKoin.kt | 11 + .../mifos/mobile/shared/MainViewController.kt | 12 + .../org/mifos/mobile/shared/Platform.ios.kt | 9 + .../mifos/mobile/shared/di/Modules.native.kt | 6 + 153 files changed, 987 insertions(+), 4249 deletions(-) delete mode 100644 .run/cmp-desktop.run.xml delete mode 100644 .run/cmp-web-js.run.xml delete mode 100644 .run/cmp-web-wasm.run.xml create mode 100644 .run/mifospay-desktop.run.xml create mode 100644 .run/mifospay-web-js.run.xml create mode 100644 .run/mifospay-web-wasm.run.xml rename {cmp-android => androidApp}/.gitignore (100%) rename {cmp-android => androidApp}/README.md (100%) rename {cmp-android => androidApp}/build.gradle.kts (95%) rename {cmp-android => androidApp}/debug_keystore.jks (100%) rename {cmp-android => androidApp}/dependencies/demoDebugRuntimeClasspath.txt (96%) rename {cmp-android => androidApp}/dependencies/demoReleaseRuntimeClasspath.txt (95%) rename {cmp-android => androidApp}/dependencies/prodDebugRuntimeClasspath.txt (96%) rename {cmp-android => androidApp}/dependencies/prodReleaseRuntimeClasspath.txt (95%) rename {cmp-android => androidApp}/dependencies/releaseRuntimeClasspath.tree.txt (100%) rename {cmp-android => androidApp}/dependencies/releaseRuntimeClasspath.txt (100%) rename {cmp-android => androidApp}/fabric.properties (100%) rename {cmp-android => androidApp}/google-services.json (100%) rename {cmp-android => androidApp}/lint-baseline.xml (100%) rename {cmp-android => androidApp}/proguard-rules.pro (100%) rename {cmp-android => androidApp}/release-badging.txt (100%) rename {cmp-android => androidApp}/src/androidTest/kotlin/org/mifos/mobile/ApplicationTest.kt (100%) rename {cmp-android => androidApp}/src/main/AndroidManifest.xml (97%) rename {cmp-android => androidApp}/src/main/ic_launcher-playstore.png (100%) create mode 100644 androidApp/src/main/kotlin/org/mifos/mobile/HomeActivity.kt rename cmp-shared/src/commonMain/kotlin/org/mifos/mobile/shared/MifosMobileViewModel.kt => androidApp/src/main/kotlin/org/mifos/mobile/HomeActivityViewModel.kt (54%) create mode 100644 androidApp/src/main/kotlin/org/mifos/mobile/MifosSelfServiceApp.kt rename {cmp-shared/src/commonMain/kotlin/org/mifos/mobile/shared => androidApp/src/main/kotlin/org/mifos/mobile}/navigation/MifosNavGraph.kt (92%) create mode 100644 androidApp/src/main/kotlin/org/mifos/mobile/navigation/MifosNavHost.kt create mode 100644 androidApp/src/main/kotlin/org/mifos/mobile/navigation/PasscodeNavGraph.kt rename {cmp-shared/src/commonMain/kotlin/org/mifos/mobile/shared => androidApp/src/main/kotlin/org/mifos/mobile}/navigation/RootNavGraph.kt (73%) rename cmp-shared/src/commonMain/kotlin/org/mifos/mobile/shared/ui/MifosMobileApp.kt => androidApp/src/main/kotlin/org/mifos/mobile/ui/MifosApp.kt (81%) rename {cmp-shared/src/commonMain/kotlin/org/mifos/mobile/shared => androidApp/src/main/kotlin/org/mifos/mobile}/ui/MifosMobileState.kt (95%) rename {cmp-android => androidApp}/src/main/res/drawable/mifos_logo.png (100%) rename {cmp-android => androidApp}/src/main/res/drawable/mifos_splash_screen_logo.png (100%) rename {cmp-android => androidApp}/src/main/res/drawable/splash_icon.xml (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-hdpi/ic_launcher.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-hdpi/ic_launcher_round.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-mdpi/ic_launcher.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-mdpi/ic_launcher_round.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-xhdpi/ic_launcher.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-xhdpi/ic_launcher_round.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-xxhdpi/ic_launcher.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-xxxhdpi/ic_launcher.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp (100%) rename {cmp-android => androidApp}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp (100%) rename {cmp-android => androidApp}/src/main/res/values-ar/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-bn/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-es/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-fa-rAF/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-fr/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-hi/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-in/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-km/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-kn/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-my/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-pl/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-pt/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-ru/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-sw/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-te/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values-ur/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/values/colors.xml (100%) rename {cmp-android => androidApp}/src/main/res/values/ic_launcher_background.xml (100%) rename {cmp-android => androidApp}/src/main/res/values/splash.xml (100%) rename {cmp-android => androidApp}/src/main/res/values/strings.xml (100%) rename {cmp-android => androidApp}/src/main/res/xml/fileproviderpath.xml (100%) rename {cmp-android => androidApp}/src/release/res/values/api_keys.xml (100%) delete mode 100644 cmp-android/src/main/kotlin/org/mifos/mobile/AndroidApp.kt delete mode 100644 cmp-android/src/main/kotlin/org/mifos/mobile/MainActivity.kt delete mode 100644 cmp-desktop/.gitignore delete mode 100644 cmp-desktop/build.gradle.kts delete mode 100644 cmp-desktop/icons/ic_launcher.icns delete mode 100644 cmp-desktop/icons/ic_launcher.ico delete mode 100644 cmp-desktop/icons/ic_launcher.png delete mode 100644 cmp-desktop/proguard-rules.pro delete mode 100644 cmp-desktop/src/desktopMain/kotlin/main.kt delete mode 100644 cmp-shared/src/commonMain/composeResources/values/strings.xml delete mode 100644 cmp-shared/src/commonMain/kotlin/org/mifos/mobile/shared/MifosMobileSharedApp.kt delete mode 100644 cmp-shared/src/commonMain/kotlin/org/mifos/mobile/shared/di/KoinModules.kt delete mode 100644 cmp-shared/src/commonMain/kotlin/org/mifos/mobile/shared/navigation/MifosNavHost.kt delete mode 100644 cmp-shared/src/commonMain/kotlin/org/mifos/mobile/shared/navigation/PasscodeNavGraph.kt delete mode 100644 cmp-shared/src/iosMain/kotlin/org/mifos/mobile/shared/MainViewController.kt delete mode 100644 cmp-shared/src/iosMain/kotlin/org/mifos/mobile/shared/di/Modules.native.kt delete mode 100644 cmp-shared/src/nativeMain/kotlin/org/mifos/mobile/shared/MifosViewController.kt delete mode 100644 cmp-web/.gitignore delete mode 100644 cmp-web/build.gradle.kts delete mode 100644 cmp-web/proguard-rules.pro delete mode 100644 cmp-web/src/jsMain/kotlin/Application.kt delete mode 100644 cmp-web/src/jsMain/resources/favicon.ico delete mode 100644 cmp-web/src/jsMain/resources/index.html delete mode 100644 cmp-web/src/jsMain/resources/styles.css delete mode 100644 cmp-web/src/wasmJsMain/kotlin/Main.kt delete mode 100644 cmp-web/src/wasmJsMain/resources/favicon.ico delete mode 100644 cmp-web/src/wasmJsMain/resources/index.html rename {cmp-ios => iosApp}/iosApp.xcodeproj/project.pbxproj (100%) rename {cmp-ios => iosApp}/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {cmp-ios => iosApp}/iosApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {cmp-ios => iosApp}/iosApp.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate (100%) rename {cmp-ios => iosApp}/iosApp.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/xcschememanagement.plist (100%) rename {cmp-ios => iosApp}/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename {cmp-ios => iosApp}/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {cmp-ios => iosApp}/iosApp/Assets.xcassets/Contents.json (100%) rename {cmp-ios => iosApp}/iosApp/ContentView.swift (100%) rename {cmp-ios => iosApp}/iosApp/Preview Content/Preview Assets.xcassets/Contents.json (100%) rename {cmp-ios => iosApp}/iosApp/iosAppApp.swift (100%) delete mode 100644 kotlin-js-store/yarn.lock rename {cmp-shared => shared}/README.md (100%) rename {cmp-shared => shared}/build.gradle.kts (56%) create mode 100644 shared/src/androidMain/kotlin/org/mifos/mobile/shared/MainActivity.kt create mode 100644 shared/src/androidMain/kotlin/org/mifos/mobile/shared/MyApplication.kt create mode 100644 shared/src/androidMain/kotlin/org/mifos/mobile/shared/Platform.android.kt create mode 100644 shared/src/androidMain/kotlin/org/mifos/mobile/shared/di/Modules.android.kt create mode 100644 shared/src/commonMain/kotlin/org/mifos/mobile/shared/App.kt create mode 100644 shared/src/commonMain/kotlin/org/mifos/mobile/shared/Platform.kt create mode 100644 shared/src/commonMain/kotlin/org/mifos/mobile/shared/di/Modules.kt create mode 100644 shared/src/commonMain/kotlin/org/mifos/mobile/shared/di/initKoin.kt create mode 100644 shared/src/iosMain/kotlin/org/mifos/mobile/shared/MainViewController.kt create mode 100644 shared/src/iosMain/kotlin/org/mifos/mobile/shared/Platform.ios.kt create mode 100644 shared/src/iosMain/kotlin/org/mifos/mobile/shared/di/Modules.native.kt diff --git a/.github/actions/create-release-notes/action.yml b/.github/actions/create-release-notes/action.yml index be71adca7..6cc1e7464 100644 --- a/.github/actions/create-release-notes/action.yml +++ b/.github/actions/create-release-notes/action.yml @@ -41,7 +41,7 @@ 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 }}" @@ -49,8 +49,8 @@ runs: 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 index 6462800dd..5ba553c3a 100644 --- 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 index 2dd36e834..c60d6093c 100644 --- 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 index 3b173133c..36eba8093 100644 --- 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 deleted file mode 100644 index 99179a9e9..000000000 --- a/.run/cmp-desktop.run.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - true - true - false - false - - - \ No newline at end of file diff --git a/.run/cmp-web-js.run.xml b/.run/cmp-web-js.run.xml deleted file mode 100644 index 89a8b9653..000000000 --- a/.run/cmp-web-js.run.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - true - true - false - false - - - \ No newline at end of file diff --git a/.run/cmp-web-wasm.run.xml b/.run/cmp-web-wasm.run.xml deleted file mode 100644 index 386b684f3..000000000 --- a/.run/cmp-web-wasm.run.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - true - true - false - false - - - \ No newline at end of file diff --git a/.run/mifospay-android.run.xml b/.run/mifospay-android.run.xml index f141851fb..186e06fe7 100644 --- a/.run/mifospay-android.run.xml +++ b/.run/mifospay-android.run.xml @@ -1,6 +1,6 @@ - - + +