Update codemagic.yaml

Author: martenrebane

codemagic.yaml

@@ -155,14 +155,13 @@ workflows:
           ./gradlew clean test --no-daemon
       - name: Setup Gradle and 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)
           
-          echo "Internal Build Number: $INTERNAL_BUILD_NUMBER"
-          echo "Release Build Number: $RELEASE_BUILD_NUMBER"
-          
           # 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))
@@ -173,14 +172,15 @@ workflows:
               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
+          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
-          echo APP_VERSION=$APP_VERSION_NAME.$LATEST_BUILD_NUMBER >> $CM_ENV
-          echo $APP_VERSION
+          APP_VERSION="$APP_VERSION_NAME.$LATEST_BUILD_NUMBER"
+          echo "APP_VERSION=$APP_VERSION" >> $CM_ENV
+          echo "Using app version: $APP_VERSION"
 
           # Build app
           ./gradlew clean --no-daemon fetchAndPackageDefaultConfiguration -PappVersionName=$APP_VERSION -PappVersionCode=$LATEST_BUILD_NUMBER assembleRelease