fix(ci): separate android and ios version bump

Author: a-ghorbani

.github/workflows/release.yml

@@ -56,22 +56,20 @@ jobs:
           ruby-version: '3.2.3'  # Specify a Ruby version
           bundler-cache: true
 
-      # Step 5: Bump version using Fastlane
-      - name: Bump version
-        run: bundle exec fastlane bump_version version_type:${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }}
+      # Step 5: Bump Android version
+      - name: Bump Android version
+        run: bundle exec fastlane bump_version_android version_type:${{ github.event_name == 'workflow_dispatch' && github.event.inputs.version_type || 'patch' }}
 
-      # Step 6: Commit and push version changes
-      - name: Commit and push version changes
+      # Step 6: Commit and push Android version changes
+      - name: Commit and push Android version changes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git config user.name "GitHub Actions"
           git config user.email "[email protected]"
-          git add .version package.json android/app/build.gradle ios/**/Info.plist
-          git commit -m "Bump version to $(cat .version)"
+          git add .version package.json android/app/build.gradle
+          git commit -m "Bump Android version to $(cat .version)"
           git push
-          git tag "v$(cat .version)"
-          git push origin "v$(cat .version)"
 
       # Step 7: Set up Android Keystore
       - name: Set up Android Keystore
@@ -145,7 +143,24 @@ jobs:
         working-directory: ios
         run: pod install
 
-      # Step 6: Build and upload iOS app to TestFlight
+      # Step 6: Bump iOS version
+      - name: Bump iOS version
+        run: bundle exec fastlane bump_version_ios
+
+      # Step 7: Commit, push, and tag iOS version changes
+      - name: Commit, push, and tag iOS version changes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "[email protected]"
+          git add ios/**/Info.plist
+          git commit -m "Bump iOS version to $(cat .version)"
+          git push
+          git tag "v$(cat .version)"
+          git push origin "v$(cat .version)"
+
+      # Step 8: Build and upload iOS app to TestFlight
       - name: Build and upload iOS app
         working-directory: ios
         env:

fastlane/Fastfile

@@ -1,34 +1,38 @@
-desc "Bump version for both Android and iOS"
-lane :bump_version do |options|
-  version_type = options[:version_type] || "patch" # Default to "patch" if not provided
+desc "Bump version for Android"
+lane :bump_version_android do |options|
+  version_type = options[:version_type] || "patch"
 
   # Bump version in package.json using Yarn
-  begin
-    sh("yarn version --#{version_type} --no-git-tag-version")
-    new_version = JSON.parse(File.read('package.json'))['version']
-    sh("echo #{new_version} > .version")
-  rescue => e
-    UI.user_error!("Failed to bump version: #{e.message}")
-  end
-
-  # Bump iOS version
-  increment_version_number(version_number: new_version)
-  increment_build_number
+  sh("yarn version --#{version_type} --no-git-tag-version")
+  new_version = JSON.parse(File.read('package.json'))['version']
+  sh("echo #{new_version} > .version")
 
   # Bump Android version
   gradle_file = "./android/app/build.gradle"
   android_version_code = get_version_code_from_gradle(gradle_file: gradle_file).to_i + 1
-  android_version_name = new_version
+  
   update_gradle_property(
     property: "versionCode",
     value: android_version_code.to_s,
     gradle_file: gradle_file
   )
   update_gradle_property(
     property: "versionName",
-    value: "\"#{android_version_name}\"",
+    value: "\"#{new_version}\"",
     gradle_file: gradle_file
   )
 
-  UI.message("Bumped version to #{new_version}")
+  UI.message("Bumped Android version to #{new_version}")
+end
+
+desc "Bump version for iOS"
+lane :bump_version_ios do |options|
+  # Read the version from package.json
+  new_version = JSON.parse(File.read('package.json'))['version']
+
+  # Bump iOS version
+  increment_version_number(version_number: new_version)
+  increment_build_number
+
+  UI.message("Bumped iOS version to #{new_version}")
 end