Update codemagic.yaml

Author: martenrebane

codemagic.yaml

@@ -104,11 +104,39 @@ workflows:
           ./gradlew clean test --no-daemon
       - name: Build RIA DigiDoc
         script: |
+          # Get latest build numbers from "internal" and "production" tracks
+          LATEST_GOOGLE_PLAY_INTERNAL_BUILD_NUMBER=$(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks internal)
+          LATEST_GOOGLE_PLAY_PRODUCTION_BUILD_NUMBER=$(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks production)
+          
+          # Check that both tracks have valid build numbers (over 0) and select the highest.
+          # Add +1 to the highest build number to submit to Google Play
+          # If any are 0, use build number
+          if [ "$LATEST_GOOGLE_PLAY_INTERNAL_BUILD_NUMBER" -gt 0 ] && [ "$LATEST_GOOGLE_PLAY_PRODUCTION_BUILD_NUMBER" -gt 0 ]; then
+           if [ "$LATEST_GOOGLE_PLAY_INTERNAL_BUILD_NUMBER" -gt "$LATEST_GOOGLE_PLAY_PRODUCTION_BUILD_NUMBER" ]; then
+             LATEST_BUILD_NUMBER=$(($LATEST_GOOGLE_PLAY_INTERNAL_BUILD_NUMBER + 1))
+             echo "Internal build number is highest, new build number for this build: $LATEST_BUILD_NUMBER"
+             echo LATEST_BUILD_NUMBER=$LATEST_BUILD_NUMBER >> $CM_ENV
+           else
+             LATEST_BUILD_NUMBER=$(($LATEST_GOOGLE_PLAY_PRODUCTION_BUILD_NUMBER + 1))
+             echo "Release build number is highest, new build number for this build: $LATEST_BUILD_NUMBER"
+             echo LATEST_BUILD_NUMBER=$LATEST_BUILD_NUMBER >> $CM_ENV
+           fi
+          else
+             echo "One or both build numbers are 0, using build number"
+             LATEST_BUILD_NUMBER="$APP_VERSION_NAME.$PROJECT_BUILD_NUMBER"
+          fi
+
+          # Make latest build number be available in all build steps
+          APP_VERSION="$APP_VERSION_NAME.$LATEST_BUILD_NUMBER"
+          echo "APP_VERSION=$APP_VERSION" >> $CM_ENV
+          echo "Using app version: $APP_VERSION"
+
+          # Build app
           # Not running 'fetchAndPackageDefaultConfiguration' for repo.ria as necessary files are already setup
           if [[ "${{ inputs.defaultCentralConfigurationTslUrl_input }}" == *"repo.ria"* ]]; then
-            ./gradlew clean --no-daemon -PappVersionName=$APP_VERSION_NAME.$PROJECT_BUILD_NUMBER assemble --debug
+            ./gradlew clean --no-daemon -PappVersionName=$APP_VERSION -PappVersionCode=$LATEST_BUILD_NUMBER assemble --debug
           else
-            ./gradlew clean --no-daemon fetchAndPackageDefaultConfiguration --args="${{ inputs.defaultCentralConfigurationUrl_input }} ${{ inputs.defaultCentralConfigurationUpdateInterval_input }}" -PappVersionName=$APP_VERSION_NAME.$PROJECT_BUILD_NUMBER assemble --debug
+            ./gradlew clean --no-daemon fetchAndPackageDefaultConfiguration --args="${{ inputs.defaultCentralConfigurationUrl_input }} ${{ inputs.defaultCentralConfigurationUpdateInterval_input }}" -PappVersionName=$APP_VERSION -PappVersionCode=$LATEST_BUILD_NUMBER assemble --debug
           fi
       - name: Align APK
         script: |
@@ -118,12 +146,10 @@ workflows:
           apksigner sign --ks $CM_KEYSTORE_PATH --ks-pass pass:$CM_KEYSTORE_PASSWORD --out app/build/outputs/apk/release/app-release_$APP_VERSION.apk app/build/outputs/apk/release/app-release-unsigned-aligned.apk
       - name: Rename and move APK
         script: |
-          mkdir -p app/build/outputs/apk/release/signed/
+          mkdir -p app/build/outputs/apk/release/signed-debug/
           mv app/build/outputs/apk/release/app-release_$APP_VERSION.apk app/build/outputs/apk/release/signed/RIA_DigiDoc_dev_$APP_VERSION.apk
-
-          aapt dump badging app/build/outputs/apk/release/signed/RIA_DigiDoc_$APP_VERSION.apk | grep versionCode
     artifacts:
-      - app/build/outputs/apk/release/signed/*.apk
+      - app/build/outputs/apk/release/signed-debug/*.apk
     publishing:
       email:
         recipients:
@@ -153,7 +179,7 @@ workflows:
       - name: Run tests
         script: |
           ./gradlew clean test --no-daemon
-      - name: Setup Gradle and Build RIA DigiDoc
+      - name: Build RIA DigiDoc
         script: |
           # Get latest build numbers from "internal" and "production" tracks
           LATEST_GOOGLE_PLAY_INTERNAL_BUILD_NUMBER=$(google-play get-latest-build-number --package-name "$PACKAGE_NAME" --tracks internal)
@@ -194,8 +220,6 @@ workflows:
         script: |
           mkdir -p app/build/outputs/apk/release/signed/
           mv app/build/outputs/apk/release/app-release_$APP_VERSION.apk app/build/outputs/apk/release/signed/RIA_DigiDoc_$APP_VERSION.apk
-
-          aapt dump badging app/build/outputs/apk/release/signed/RIA_DigiDoc_$APP_VERSION.apk | grep versionCode
     artifacts:
       - app/build/outputs/apk/release/signed/*.apk
     publishing: