fix: Fixed Desktop Build & Added Firebase App Distribution (#1816)

* Feat: KMP Library Setup (#1766) * Migrating from hilt to koin (This) (#1764) * Migrating from hilt to koin * Fixed Instance creation error * refactor: Removed Hilt and migrated to Koin This commit removes Hilt and migrates the project to Koin for dependency injection. The following changes were made: - Removed the `AndroidHiltConventionPlugin`. - Added the `AndroidKoinConventionPlugin`. - Updated dependencies to use Koin. - Updated KSP configuration for Koin. - Updated feature modules to use Koin. - Updated common modules to use Koin . - Removed Hilt annotations and replaced them with Koin annotations. - Updated ViewModels to use Koin for dependency injection. - Updated modules to use Koin for dependency injection. * Formatted Dependencies * migrating from hilt to koin clean up commit * Revert "migrating from hilt to koin clean up commit" This reverts commit bb63058. --------- Co-authored-by: Sk Niyaj Ali <[email protected]> * Feat: KMP Library Setup --------- Co-authored-by: Nagarjuna <[email protected]> * Feat: [:core:model] - Migrated to KMM (#1770) * Feat: [:core:common] KMP Migration (#1768) * Feat: [:core:common] KMP Migration * Updated Usage Declaration * Feat: [:core:datastore] - Migrated to KMP (#1769) * Feat: [:core:network] - Migrated to KMP (#1772) * Feat: [:core:network] - Migrated to KMP * Feat: [:core:data] - Migrated to KMP Library * Feat: [:core:designsystem] - Migrated to KMP with CMP Library (#1774) * Feat: [:core:ui] - Migrated to KMP with CMP Library (#1775) * Feat: [:feature:auth] - Migrated to Kotlin Multiplatform (#1782) * Feat: [:feature:auth] - Migrated to Kotlin Multiplatform * Added Support For Web * Feat: Migrated Passcode Module to KMP (#1783) * Feat: Migrated Home Module to KMP (#1784) * Feat: Migrated Edit Password Module to KMP (#1787) * Feat: Migrated FAQ module to kmp (#1786) * Feat: Migrated Settings Module to KMP (#1785) * Feat: Migrated Profile Module to KMP (#1788) * Feat: Migrated History Module to KMP (#1790) * Feat: Migrated Payments Module to KMP (#1791) * Feat: Migrated Finance Module to KMP (#1792) * Feat: Migrated Accounts Module to KMP (#1793) * Feat: Migrated Accounts Module to KMP * Updated README.md * Update README.md * Feat: Migrated Invoices Module to KMP (#1794) * Feat: Migrated KYC Module to KMP (#1798) * Migrated Notification Module to KMP (#1799) * Feat: Migrated KYC Module to KMP * Feat: Migrated Notification Module to KMP * Feat: Migrated Saved Card Module to KMP (#1800) * Feat: Migrated Receipt Module to KMP (#1801) * fix: Ios Build (#1802) * Feat: Migrated SI Module to KMP (#1803) * Feat: Migrated Request Money Module to KMP (#1807) * Feat: Migrated Send Money Module to KMP (#1808) * Feat: Migrated Make Transfer Module to KMP (#1809) * Feat: Migrated QR Module to KMP (#1810) * Feat: Migrated UPI Setup Module to KMP (#1811) * Feat: Final Clean-up For KMP (#1812) * Feat: Final Cleanup For KMP * Update README.md * Update EditPassword README.md * Update FAQ README.md * Update Finance README.md * Update History README.md * Update Home README.md * Update Invoice README.md * Update KYC README.md * Update Make Transfer README.md * Update Notification README.md * Update Payments README.md * Update Profile README.md * Update Saved Card README.md * Update Send Money README.md * Update Settings README.md * Update SI README.md * Migrating from hilt to koin (This) (#1764) * Migrating from hilt to koin * Fixed Instance creation error * refactor: Removed Hilt and migrated to Koin This commit removes Hilt and migrates the project to Koin for dependency injection. The following changes were made: - Removed the `AndroidHiltConventionPlugin`. - Added the `AndroidKoinConventionPlugin`. - Updated dependencies to use Koin. - Updated KSP configuration for Koin. - Updated feature modules to use Koin. - Updated common modules to use Koin . - Removed Hilt annotations and replaced them with Koin annotations. - Updated ViewModels to use Koin for dependency injection. - Updated modules to use Koin for dependency injection. * Formatted Dependencies * migrating from hilt to koin clean up commit * Revert "migrating from hilt to koin clean up commit" This reverts commit bb63058. --------- Co-authored-by: Sk Niyaj Ali <[email protected]> * Profile UI redesign (#1767) * Refactor Profile UI * Fixed Build Issue * Profile UI Bug Fix & Improvement * added placeholder for when uri is null cleanup fix spotless test failure * Fix - CI Build Issue --------- Co-authored-by: Sk Niyaj Ali <[email protected]> * refactor: Redesign payment screen (#1773) * refactor: Redesign payment screen * resolved detekt error * refactor : changed current theme instead of using NewUi * resolved spotless errors * refactor: Redesign finance screen (#1777) * refactor: Redesign payment screen * resolved detekt error * refactor : changed current theme instead of using NewUi * resolved spotless errors * refactor: Redesign finance screen UI * resolved spotless errors * resolved conflicts * changed structure of accounts screen * refactor padding values in finance screen * fix: dark theme colors (#1789) * fix: dark theme colors * fixed edit icon tint * Fix invoice api (#1797) * Redesign requeset screen UI * fix MissingKoinDefinitionException * removed comments and fixed share qr code bug * fix: Invoice APIs * update readme file (#1804) * update readme file * update readme file * update readme file with how to contribute * Add branch policy (#1805) * update readme file * update readme file * update readme file with how to contribute * update readme file with how to contribute * update readme file with branch Policy --------- Co-authored-by: Rajan Maurya <[email protected]> * Migrating from hilt to koin (This) (#1764) * Migrating from hilt to koin * Fixed Instance creation error * refactor: Removed Hilt and migrated to Koin This commit removes Hilt and migrates the project to Koin for dependency injection. The following changes were made: - Removed the `AndroidHiltConventionPlugin`. - Added the `AndroidKoinConventionPlugin`. - Updated dependencies to use Koin. - Updated KSP configuration for Koin. - Updated feature modules to use Koin. - Updated common modules to use Koin . - Removed Hilt annotations and replaced them with Koin annotations. - Updated ViewModels to use Koin for dependency injection. - Updated modules to use Koin for dependency injection. * Formatted Dependencies * migrating from hilt to koin clean up commit * Revert "migrating from hilt to koin clean up commit" This reverts commit bb63058. --------- Co-authored-by: Sk Niyaj Ali <[email protected]> * Merge kmm-impl to dev * Update make_site.yaml * fix: Fixed Desktop Versioning * - Added Firebase App Distribution --------- Co-authored-by: Nagarjuna <[email protected]> Co-authored-by: Rajan Maurya <[email protected]> Co-authored-by: Pronay Sarker <[email protected]> Co-authored-by: kapmaurya <[email protected]>
openMF · Nov 19, 2024 · 0e0537e · 0e0537e
1 parent 6980ca7
commit 0e0537e
Show file tree

Hide file tree

Showing 37 changed files with 168 additions and 298 deletions.
diff --git a/.github/actions/inflate-secrets/action.yml b/.github/actions/inflate-secrets/action.yml
@@ -10,6 +10,9 @@ inputs:
   playstore-creds:
     description: 'The playstore credentials to inflate'
     required: true
+  firebase-creds:
+    description: 'The firebase credentials to inflate'
+    required: true
 runs:
   using: 'composite'
   steps:
@@ -38,3 +41,10 @@ runs:
         CREDS: ${{ inputs.playstore-creds }}
       run: |
         echo $CREDS > mifospay-android/playStorePublishServiceCredentialsFile.json
+
+    - name: Inflate firebaseAppDistributionServiceCredentialsFile.json
+      shell: bash
+      env:
+        CREDS: ${{ inputs.firebase-creds }}
+      run: |
+        echo $CREDS > mifospay-android/firebaseAppDistributionServiceCredentialsFile.json
diff --git a/.github/mockFirebaseAppDistributionServiceCredentialsFile.json b/.github/mockFirebaseAppDistributionServiceCredentialsFile.json
@@ -0,0 +1,13 @@
+{
+  "type": "service_account",
+  "project_id": "mifoswallet-baa0c",
+  "private_key_id": "private_key_id",
+  "private_key": "private_key",
+  "client_email": "client_email",
+  "client_id": "111380693391682832489",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-w3hi9%40mifoswallet-baa0c.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}
diff --git a/.github/workflows/internal_or_beta_release.yml b/.github/workflows/internal_or_beta_release.yml
@@ -42,7 +42,7 @@ jobs:
         run: ./gradlew packageReleaseDistributionForCurrentOS
 
   app_build:
-    name: Github, Firebase, and Sentry Release
+    name: Github, Firebase Release
     needs: [ build_desktop_app ]
     runs-on: ubuntu-latest
     permissions:
@@ -76,6 +76,7 @@ jobs:
           keystore: ${{ secrets.ORIGINAL_KEYSTORE_FILE }}
           google-services: ${{ secrets.GOOGLESERVICES }}
           playstore-creds: ${{ secrets.PLAYSTORECREDS }}
+          firebase-creds: ${{ secrets.FIREBASECREDS }}
 
       - uses: ./.github/actions/create-release-notes
         name: Create Release Notes
@@ -121,6 +122,15 @@ jobs:
             ./mifospay-desktop/build/compose/binaries/main-release/msi/*.msi
             ./mifospay-desktop/build/compose/binaries/main-release/deb/*.deb
             ./mifospay-desktop/build/compose/binaries/main-release/dmg/*.dmg
+      
+
+      - name: ☁️ Deploy to Firebase
+        env:
+          KEYSTORE_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_FILE_PASSWORD }}
+          KEYSTORE_ALIAS: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS }}
+          KEYSTORE_ALIAS_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS_PASSWORD }}
+          VERSION_CODE: ${{ steps.rel_number.outputs.version-code }}
+        run: ./gradlew appDistributionUploadProdRelease --no-configuration-cache
 
       - name: Print `git status`
         run: git status
@@ -161,6 +171,7 @@ jobs:
           keystore: ${{ secrets.UPLOAD_KEYSTORE_FILE }}
           google-services: ${{ secrets.GOOGLESERVICES }}
           playstore-creds: ${{ secrets.PLAYSTORECREDS }}
+          firebase-creds: ${{ secrets.FIREBASECREDS }}
 
       - uses: ./.github/actions/create-release-notes
         name: Create Release Notes
@@ -177,6 +188,12 @@ jobs:
         run: |
           ./gradlew :mifospay-android:bundleRelease
 
+      - name: Archive Build
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-aabs
+          path: ./**/*.aab
+
       - name: Deploy to Playstore Internal
         run: bundle exec fastlane deploy_internal
 

diff --git a/.github/workflows/make_site.yaml b/.github/workflows/make_site.yaml
@@ -25,7 +25,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -46,4 +46,4 @@ jobs:
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/master_dev_ci.yml b/.github/workflows/master_dev_ci.yml
@@ -64,6 +64,7 @@ jobs:
 
 
 
+
   dependency_guard:
     needs: setup
     runs-on: ubuntu-latest
@@ -100,32 +101,8 @@ jobs:
           disable_globbing: true
           commit_message: "🤖 Updates baselines for Dependency Guard"
 
-  tests_and_lint:
-    needs: setup
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: 17
-      - name: Run tests
-        run: |
-          ./gradlew :mifospay-android:testDemoDebug
-#          ./gradlew testDemoDebug :lint:test :mifospay-android:lintProdRelease :lint:lint
-      - name: Upload reports
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-and-lint-reports
-          path: |
-            **/build/reports/lint-results-*.html
-            **/build/test-results/test*UnitTest/**.xml
-
-
-
   build:
-    needs: [ checks, dependency_guard, tests_and_lint ]
+    needs: [ checks, dependency_guard ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -145,11 +122,11 @@ jobs:
       - name: Upload APKs
         uses: actions/upload-artifact@v4
         with:
-          name: APKs
+          name: Android APKs
           path: '**/build/outputs/apk/**/*.apk'
 
   build_desktop_app:
-    needs: [ checks, dependency_guard, tests_and_lint ]
+    needs: [ checks, dependency_guard ]
     strategy:
       matrix:
         os:
@@ -174,7 +151,7 @@ jobs:
         if: matrix.os == 'windows-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Windows-App
+          name: Windows-Apps
           path: |
             ./mifospay-desktop/build/compose/binaries/main/exe/*.exe
             ./mifospay-desktop/build/compose/binaries/main/msi/*.msi
@@ -183,12 +160,12 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Windows-App
+          name: Linux-App
           path: './mifospay-desktop/build/compose/binaries/main/deb/*.deb'
 
       - name: Upload MacOS App
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Windows-App
+          name: MacOS-App
           path: './mifospay-desktop/build/compose/binaries/main/dmg/*.dmg'
diff --git a/.github/workflows/release_to_production.yml b/.github/workflows/release_to_production.yml
@@ -26,6 +26,7 @@ jobs:
           keystore: ${{ secrets.ORIGINAL_KEYSTORE_FILE }}
           google-services: ${{ secrets.GOOGLESERVICES }}
           playstore-creds: ${{ secrets.PLAYSTORECREDS }}
+          firebase-creds: ${{ secrets.FIREBASECREDS }}
 
       - name: Promote Beta to Production Play Store
         run: bundle exec fastlane promote_to_production
diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Tag Weekly Release
         env:
-          GITHUB_TOKEN: ${{ secrets.TAG_PUSH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew :reckonTagPush -Preckon.stage=final
 
       - name: Trigger Workflow

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,6 +16,7 @@ plugins {
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.dependencyGuard) apply false
     alias(libs.plugins.firebase.crashlytics) apply false
+    alias(libs.plugins.firebase.appdistribution) apply false
     alias(libs.plugins.firebase.perf) apply false
     alias(libs.plugins.gms) apply false
     alias(libs.plugins.ksp) apply false

diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -34,11 +34,6 @@ kotlin {
             implementation(libs.kotlinx.serialization.json)
         }
 
-        commonTest.dependencies {
-            implementation(libs.multiplatform.settings)
-            implementation(libs.multiplatform.settings.test)
-        }
-
         androidMain.dependencies {
             implementation(libs.androidx.core.ktx)
             implementation(libs.androidx.tracing.ktx)

diff --git a/core/datastore-proto/.gitignore b/core/datastore-proto/.gitignore
diff --git a/core/datastore-proto/README.md b/core/datastore-proto/README.md
diff --git a/core/datastore-proto/build.gradle.kts b/core/datastore-proto/build.gradle.kts
diff --git a/...ore-proto/src/commonMain/kotlin/proto/org/mifospay/core/datastore/proto/client_info.proto b/...ore-proto/src/commonMain/kotlin/proto/org/mifospay/core/datastore/proto/client_info.proto
diff --git a/...store-proto/src/commonMain/kotlin/proto/org/mifospay/core/datastore/proto/role_info.proto b/...store-proto/src/commonMain/kotlin/proto/org/mifospay/core/datastore/proto/role_info.proto
diff --git a/...store-proto/src/commonMain/kotlin/proto/org/mifospay/core/datastore/proto/user_info.proto b/...store-proto/src/commonMain/kotlin/proto/org/mifospay/core/datastore/proto/user_info.proto
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
@@ -9,6 +9,7 @@
  */
 plugins {
     alias(libs.plugins.mifospay.kmp.library)
+    id("kotlinx-serialization")
 }
 
 android {
@@ -33,7 +34,6 @@ kotlin {
             implementation(libs.kotlinx.serialization.core)
             implementation(projects.core.model)
             implementation(projects.core.common)
-            implementation(projects.core.datastoreProto)
         }
 
         commonTest.dependencies {

diff --git a/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/PreferencesMapper.kt b/core/datastore/src/commonMain/kotlin/org/mifospay/core/datastore/PreferencesMapper.kt
@@ -9,9 +9,9 @@
  */
 package org.mifospay.core.datastore
 
-import org.mifospay.core.datastore.proto.ClientPreferences
-import org.mifospay.core.datastore.proto.RolePreferences
-import org.mifospay.core.datastore.proto.UserInfoPreferences
+import org.mifospay.core.datastore.model.ClientPreferences
+import org.mifospay.core.datastore.model.RolePreferences
+import org.mifospay.core.datastore.model.UserInfoPreferences
 import org.mifospay.core.model.client.Client
 import org.mifospay.core.model.user.RoleInfo
 import org.mifospay.core.model.user.UserInfo

diff --git a/.../datastore/src/commonMain/kotlin/org/mifospay/core/datastore/UserPreferencesDataSource.kt b/.../datastore/src/commonMain/kotlin/org/mifospay/core/datastore/UserPreferencesDataSource.kt
@@ -22,8 +22,8 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.ExperimentalSerializationApi
 import org.mifospay.core.datastore.UserPreferencesDataSource.Companion.DEFAULT_ACCOUNT
-import org.mifospay.core.datastore.proto.ClientPreferences
-import org.mifospay.core.datastore.proto.UserInfoPreferences
+import org.mifospay.core.datastore.model.ClientPreferences
+import org.mifospay.core.datastore.model.UserInfoPreferences
 import org.mifospay.core.model.account.DefaultAccount
 import org.mifospay.core.model.client.Client
 import org.mifospay.core.model.client.UpdatedClient

diff --git a/...core/datastore/proto/ClientPreferences.kt → ...core/datastore/model/ClientPreferences.kt b/...core/datastore/proto/ClientPreferences.kt → ...core/datastore/model/ClientPreferences.kt
@@ -7,7 +7,7 @@
  *
  * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md
  */
-package org.mifospay.core.datastore.proto
+package org.mifospay.core.datastore.model
 
 import kotlinx.serialization.Serializable
 

diff --git a/...y/core/datastore/proto/RolePreferences.kt → ...y/core/datastore/model/RolePreferences.kt b/...y/core/datastore/proto/RolePreferences.kt → ...y/core/datastore/model/RolePreferences.kt
@@ -7,7 +7,7 @@
  *
  * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md
  */
-package org.mifospay.core.datastore.proto
+package org.mifospay.core.datastore.model
 
 import kotlinx.serialization.Serializable
 

diff --git a/...re/datastore/proto/UserInfoPreferences.kt → ...re/datastore/model/UserInfoPreferences.kt b/...re/datastore/proto/UserInfoPreferences.kt → ...re/datastore/model/UserInfoPreferences.kt
@@ -7,7 +7,7 @@
  *
  * See https://github.com/openMF/mobile-wallet/blob/master/LICENSE.md
  */
-package org.mifospay.core.datastore.proto
+package org.mifospay.core.datastore.model
 
 import kotlinx.serialization.Serializable