Feature/mage 1398

.github/workflows/build.yml

@@ -12,36 +12,30 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - name: Checkout Specified Branch
+      uses: actions/checkout@v4
       with:
-        fetch-depth: 0
+        ref: ${{ github.event.inputs.appBranch }}
     - name: Setup JDK 17
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '17'
-    - name: Checkout App Branch
-      run: git checkout ${{ github.event.inputs.appBranch }}
+        cache: 'gradle'
     - name: Setup Keystore
       run: |
         echo "${{ secrets.KEYSTORE }}" > release.b64
         base64 -d release.b64 > release.keystore
-    - name: Create Version Code
-      id: version_code
-      run: |
-        echo "value=$(git rev-list --count HEAD)" >>$GITHUB_OUTPUT
-        echo "VERSION_CODE $(git rev-list --count HEAD)"
     - name: Build Application
       run: |
         ./gradlew clean assembleRelease \
           -PKEYSTORE=../release.keystore \
           -PKEYSTORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }} \
           -PKEY_ALIAS=${{ secrets.KEY_ALIAS }} \
           -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \
-          -PRELEASE_MAPS_API_KEY=${{ secrets.MAPS_API_KEY }} \
-          -PVERSION_CODE=${{ steps.version_code.outputs.value }}
+          -PRELEASE_MAPS_API_KEY=${{ secrets.MAPS_API_KEY }}
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mage-release.apk
         path: mage/build/outputs/apk/release/mage-release.apk

.github/workflows/release.yml

@@ -9,9 +9,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
+    - name: Checkout
+      uses: actions/checkout@v4
     - name: Setup JDK 17
       uses: actions/setup-java@v3
       with:
@@ -21,21 +20,14 @@ jobs:
       run: |
         echo "${{ secrets.KEYSTORE }}" > release.b64
         base64 -d release.b64 > release.keystore
-    - name: Create Version Code
-      id: version_code
-      run: |
-        git checkout master
-        echo "value=$(git rev-list --count HEAD)" >>$GITHUB_OUTPUT
-        echo "VERSION_CODE $(git rev-list --count HEAD)"
     - name: Build Application
       run: |
         ./gradlew clean assembleRelease \
           -PKEYSTORE=../release.keystore \
           -PKEYSTORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }} \
           -PKEY_ALIAS=${{ secrets.KEY_ALIAS }} \
           -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \
-          -PRELEASE_MAPS_API_KEY=${{ secrets.MAPS_API_KEY }} \
-          -PVERSION_CODE=${{ steps.version_code.outputs.value }}
+          -PRELEASE_MAPS_API_KEY=${{ secrets.MAPS_API_KEY }}
     - name: Get Upload URL
       id: url
       run:   |
@@ -49,4 +41,4 @@ jobs:
         upload_url: ${{ steps.url.outputs.upload_url }}
         asset_path: mage/build/outputs/apk/release/mage-release.apk
         asset_name: mage-release.apk
-        asset_content_type: application/octet-stream
+        asset_content_type: application/vnd.android.package-archive

gradle.properties

@@ -3,6 +3,5 @@ android.enableJetifier=true
 org.gradle.jvmargs=-Xmx4096m
 
 # Application properties
-VERSION_CODE=1
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false

mage/build.gradle

@@ -10,7 +10,6 @@ plugins {
 }
 
 group 'mil.nga.giat.mage'
-version '7.2.3'
 ext {
     sourceRefspec = Grgit.open(currentDir: project.rootDir).head().id
 
@@ -52,16 +51,16 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlin {
-        jvmToolchain(21)
+        jvmToolchain(17)
     }
 
     kotlinOptions {
-        jvmTarget = "21"
+        jvmTarget = "17"
         freeCompilerArgs = ["-Xcontext-receivers"]
         freeCompilerArgs += [
                 "-P",
@@ -90,8 +89,8 @@ android {
 
     defaultConfig {
         applicationId "mil.nga.giat.mage"
-        versionName project.version
-        versionCode VERSION_CODE as int
+        versionCode 1951
+        versionName '7.2.3'
         minSdkVersion 27
         targetSdkVersion 34
         multiDexEnabled true