Merge branch 'develop' of https://github.com/ngageoint/geopackage-map…

…cache-android into develop
ngageoint · Nov 2, 2023 · cb74a7e · cb74a7e
2 parents 4b9dc92 + 51b653f
commit cb74a7e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 34 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,6 +15,10 @@ jobs:
       with:
         java-version: 16
         distribution: 'adopt'
+    - name: Setup Keystore
+      run: |
+        echo "${{ secrets.SIGNING_KEY }}" > release.b64
+        base64 -d release.b64 > release.keystore
     - name: mobsfscan
       uses: MobSF/[email protected]
       with:
@@ -24,21 +28,20 @@ jobs:
       with:
         sarif_file: results.sarif
     - name: Build with Gradle
-      run: ./gradlew assembleRelease -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }}
-    - name: Sign APK
-      uses: noriban/sign-android-release@v4
-      with:
-        releaseDirectory: mapcache/build/outputs/apk/release
-        signingKeyBase64: ${{ secrets.SIGNING_KEY }}
-        alias: ${{ secrets.ALIAS }}
-        keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-        keyPassword: ${{ secrets.KEY_PASSWORD }}
-    - name: Copy Release Artifacts
       run: |
-        mkdir mapcache/build/release
-        cp mapcache/build/outputs/apk/release/mapcache-*-signed.apk "mapcache/build/release/mapcache-$(./gradlew mapcache:androidAppVersion | grep versionName | sed 's/^.*@//').apk"
+        ./gradlew clean assembleRelease \
+        -PKEYSTORE=../release.keystore \
+        -PKEYSTORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }} \
+        -PKEY_ALIAS=${{ secrets.ALIAS }} \
+        -PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \
+        -PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }}
+    - name: Verify Signature
+      run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs mapcache/build/outputs/apk/release/mapcache.apk
+    - name: List files in the repository
+      run: |
+        ls -R ${{ github.workspace }}
     - name: Upload Artifacts
       uses: actions/upload-artifact@v1
       with:
         name: mapcache
-        path: mapcache/build/release
+        path: mapcache/build/outputs/apk/release/mapcache.apk
diff --git a/mapcache/build.gradle b/mapcache/build.gradle
@@ -27,9 +27,28 @@ android {
         versionName '2.1.11'
         multiDexEnabled true
     }
+    signingConfigs {
+        release {
+            if (project.hasProperty('KEYSTORE')) {
+                println 'assigning keystore'
+                storeFile file(KEYSTORE)
+                storePassword KEYSTORE_PASSWORD
+                keyAlias KEY_ALIAS
+                keyPassword KEY_PASSWORD
+            } else {
+                println 'no keystore property configured'
+            }
+        }
+    }
     buildTypes {
         release {
+            applicationVariants.all { variant ->
+                variant.outputs.all {
+                    outputFileName = "mapcache.apk"
+                }
+            }
             minifyEnabled false
+            signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             resValue "string", "GOOGLE_MAPS_ANDROID_API_KEY", googleMapsApiReleaseKey
         }
@@ -91,26 +110,6 @@ dependencies {
     testImplementation 'androidx.test:rules:1.5.0'
 }
 
-configure extensions.android, {
-    if (project.hasProperty('RELEASE_STORE_FILE') && new File((String) project.getProperty('RELEASE_STORE_FILE')).exists()) {
-        signingConfigs {
-            release {
-                storeFile file(RELEASE_STORE_FILE)
-                storePassword RELEASE_STORE_PASSWORD
-                keyAlias RELEASE_KEY_ALIAS
-                keyPassword RELEASE_KEY_PASSWORD
-            }
-        }
-        buildTypes {
-            release {
-                setSigningConfig(signingConfigs.release)
-            }
-        }
-    } else {
-        println 'no keystore configured'
-    }
-}
-
 // This is to fix the errors : java.lang.NoClassDefFoundError: Failed resolution of: Landroid/view/View$OnUnhandledKeyEventListener;
 configurations.all {
     resolutionStrategy.eachDependency { details ->
@@ -123,4 +122,4 @@ configurations.all {
     }
 }
 
-apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android'