Merge branch 'dev' into MW-260-add-basic-upi-payment-support

# Conflicts:
#	cmp-android/prodRelease-badging.txt

Author: biplab1

.github/ci-gradle.properties

@@ -0,0 +1,17 @@
+# Disable daemon for CI to avoid leftover processes
+org.gradle.daemon=false
+
+# Run tasks in parallel where possible
+org.gradle.parallel=true
+
+# Increase heap and metaspace for larger builds (macOS-latest has ~7 GB available)
+org.gradle.jvmargs=-Xmx7g
+
+# Limit max workers to avoid memory pressure in CI
+org.gradle.workers.max=3
+
+# Disable Kotlin incremental compilation in CI for clean, consistent builds
+kotlin.incremental=false
+
+# Use in-process Kotlin compiler to avoid extra forked processes
+kotlin.compiler.execution.strategy=in-process

.github/workflows/multi-platform-build-and-publish.yml

@@ -74,15 +74,20 @@ on:
         default: 'development'
         description: 'Target branch for release'
 
-      build_ios:
+      distribute_ios_firebase:
         type: boolean
         default: false
-        description: Build iOS App
+        description: Distribute iOS App via Firebase App Distribution
 
-      publish_ios:
+      distribute_ios_testflight:
         type: boolean
         default: false
-        description: Publish iOS App On App Store
+        description: Distribute iOS App via TestFlight (App Store Connect)
+
+      distribute_ios_appstore:
+        type: boolean
+        default: false
+        description: Distribute iOS App to Appstore
 
 permissions:
   contents: write
@@ -96,17 +101,27 @@ concurrency:
 jobs:
   multi_platform_build_and_publish:
     name: Multi-Platform Build and Publish
-    uses: openMF/mifos-x-actionhub/.github/workflows/multi-platform-build-and-publish.yaml@v1.0.0
+    uses: openMF/mifos-x-actionhub/.github/workflows/multi-platform-build-and-publish.yaml@main
     with:
       release_type: ${{ inputs.release_type }}
       target_branch: ${{ inputs.target_branch }}
-      android_package_name: 'mifospay-android' # <-- Change this to your android package name
-      ios_package_name: 'mifospay-ios' # <-- Change this to your ios package name
-      desktop_package_name: 'mifospay-desktop' # <-- Change this to your desktop package name
-      web_package_name: 'mifospay-web'   # <-- Change this to your web package name
-      tester_groups: 'mifos-mobile-apps' # <-- Change this to your Firebase tester group
-      build_ios: ${{ inputs.build_ios }}
-      publish_ios: ${{ inputs.publish_ios }}
+      android_package_name: 'cmp-android'
+      ios_package_name: 'cmp-ios'
+      desktop_package_name: 'cmp-desktop'
+      web_package_name: 'cmp-web'
+      tester_groups: 'mifos-mobile-apps'
+      app_identifier: 'org.mifospay'
+      git_url: '[email protected]:openMF/ios-provisioning-profile.git'
+      git_branch: 'mifospay'
+      match_type: 'adhoc'
+      provisioning_profile_name: 'match AdHoc org.mifospay'
+      firebase_app_id: '1:728434912738:ios:86a7badfaed88b841a1dbb'
+      metadata_path: './fastlane/metadata'
+      use_cocoapods: true         # <-- Set to true if using CocoaPods integration for KMP
+      shared_module: ':cmp-shared' # <-- Gradle path to your shared KMP module (e.g., :shared)
+      distribute_ios_firebase: ${{ inputs.distribute_ios_firebase }}
+      distribute_ios_testflight: ${{ inputs.distribute_ios_testflight }}
+      distribute_ios_appstore: ${{ inputs.distribute_ios_appstore }}
     secrets:
       original_keystore_file: ${{ secrets.ORIGINAL_KEYSTORE_FILE }}
       original_keystore_file_password: ${{ secrets.ORIGINAL_KEYSTORE_FILE_PASSWORD }}
@@ -121,6 +136,11 @@ jobs:
       notarization_apple_id: ${{ secrets.NOTARIZATION_APPLE_ID }}
       notarization_password: ${{ secrets.NOTARIZATION_PASSWORD }}
       notarization_team_id: ${{ secrets.NOTARIZATION_TEAM_ID }}
+      appstore_key_id: ${{ secrets.APPSTORE_KEY_ID }}
+      appstore_issuer_id: ${{ secrets.APPSTORE_ISSUER_ID }}
+      appstore_auth_key: ${{ secrets.APPSTORE_AUTH_KEY }}
+      match_password: ${{ secrets.MATCH_PASSWORD }}
+      match_ssh_private_key: ${{ secrets.MATCH_SSH_PRIVATE_KEY }}
 
       windows_signing_key: ${{ secrets.WINDOWS_SIGNING_KEY }}
       windows_signing_password: ${{ secrets.WINDOWS_SIGNING_PASSWORD }}

.github/workflows/pr-check.yml

@@ -81,7 +81,7 @@ permissions:
 jobs:
   pr_checks:
     name: PR Checks
-    uses: openMF/mifos-x-actionhub/.github/workflows/pr-check.yaml@v1.0.3
+    uses: openMF/mifos-x-actionhub/.github/workflows/pr-check.yaml@main
     secrets: inherit
     with:
       android_package_name: 'cmp-android' # <-- Change Your Android Package Name

Gemfile

@@ -7,6 +7,7 @@ rescue Errno::ENOENT
 end
 
 gem "fastlane"
+gem "cocoapods"
 
 plugins_path = File.join(File.dirname(__FILE__), "fastlane", "Pluginfile")
 eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

@@ -5,8 +5,23 @@ GEM
       base64
       nkf
       rexml
+    activesupport (7.2.2.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
@@ -30,18 +45,63 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.3.0)
+    benchmark (0.3.0)
     bigdecimal (3.2.2)
     claide (1.1.0)
+    cocoapods (1.16.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.16.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
+      activesupport (>= 5.0, < 8)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (2.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     declarative (0.0.20)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
+    drb (2.2.0)
+      ruby2_keywords
     emoji_regex (3.2.3)
+    escape (0.0.4)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
     excon (0.112.0)
     faraday (1.10.4)
       faraday-em_http (~> 1.0)
@@ -120,6 +180,9 @@ GEM
     fastlane-plugin-increment_build_number (0.0.4)
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)
+    ffi (1.17.1-arm64-darwin)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -166,23 +229,29 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.9.0)
       mutex_m
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     json (2.13.2)
     jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
+    minitest (5.20.0)
+    molinillo (0.8.0)
     multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
+    nap (1.1.0)
     naturally (2.3.0)
+    netrc (0.11.0)
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
     plist (3.7.2)
-    public_suffix (6.0.2)
+    public_suffix (4.0.7)
     rake (13.3.0)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -191,8 +260,10 @@ GEM
     retriable (3.1.2)
     rexml (3.4.1)
     rouge (3.28.0)
+    ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
+    securerandom (0.3.1)
     security (0.1.5)
     signet (0.20.0)
       addressable (~> 2.8)
@@ -211,6 +282,10 @@ GEM
     tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
+    typhoeus (1.4.1)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.6.0)
     word_wrap (1.0.0)
@@ -227,10 +302,11 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
+  arm64-darwin-24
   ruby
-  x64-mingw-ucrt
 
 DEPENDENCIES
+  cocoapods
   fastlane
   fastlane-plugin-firebase_app_distribution
   fastlane-plugin-increment_build_number

build-logic/convention/src/main/kotlin/org/mifospay/KotlinMultiplatform.kt

@@ -13,9 +13,9 @@ internal fun Project.configureKotlinMultiplatform() {
 
         jvm("desktop")
         androidTarget()
+        iosArm64()
         iosSimulatorArm64()
         iosX64()
-        iosArm64()
         js(IR) {
             this.nodejs()
             binaries.executable()

cmp-android/prodRelease-badging.txt

@@ -1,4 +1,4 @@
-package: name='org.mifospay' versionCode='1' versionName='2025.8.3-beta.0.5' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
+package: name='org.mifospay' versionCode='1' versionName='2025.8.2-beta.0.3' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
 minSdkVersion:'26'
 targetSdkVersion:'34'
 uses-permission: name='android.permission.INTERNET'

cmp-ios/Podfile

@@ -1,12 +1,21 @@
-platform :ios, '16.0'
-use_frameworks!
+deployment_target = '16.0'
 
 target 'iosApp' do
-  project 'iosApp.xcodeproj'
+  use_frameworks!
+  platform :ios, deployment_target
+  # Pods for iosApp
   pod 'cmp_shared', :path => '../cmp-shared'
+end
 
-  # Native Firebase iOS Pods required by firebase-kotlin-sdk
-  pod 'FirebaseCore'
-  pod 'FirebaseAnalytics'
-  pod 'FirebaseCrashlytics'
+post_install do |installer|
+    installer.generated_projects.each do |project|
+        project.targets.each do |target|
+            target.build_configurations.each do |config|
+                config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
+            end
+        end
+        project.build_configurations.each do |config|
+            config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
+        end
+    end
 end

cmp-ios/Podfile.lock

@@ -0,0 +1,16 @@
+PODS:
+  - cmp_shared (1.0)
+
+DEPENDENCIES:
+  - cmp_shared (from `../cmp-shared`)
+
+EXTERNAL SOURCES:
+  cmp_shared:
+    :path: "../cmp-shared"
+
+SPEC CHECKSUMS:
+  cmp_shared: 572f72160ae05ea5b3f48ce339a45689782322e3
+
+PODFILE CHECKSUM: fba668dc0eba2e4694ef273d90789cf739b8504c
+
+COCOAPODS: 1.16.2