fix: update default opensqueeze keystores

.github/workflows/release.yml

@@ -71,8 +71,8 @@ jobs:
 
       - name: Setting up keystores
         run: |
-          echo ${{ secrets.RELEASE_KEYSTORE_BASE64 }} | base64 --decode > app/release_keystore.jks
-          echo ${{ secrets.DEBUG_KEYSTORE_BASE64 }} | base64 --decode > app/debug_keystore.jks
+          echo ${{ secrets.RELEASE_KEYSTORE_BASE64 }} | base64 --decode > app/keystores/opensqueeze_release.jks
+          echo ${{ secrets.DEBUG_KEYSTORE_BASE64 }} | base64 --decode > app/keystores/opensqueeze_debug.jks
 
       - run: echo Building with version ${{ env.next_version_name }}, build number ${{ env.next_build_number }}
 
@@ -82,7 +82,7 @@ jobs:
           -PversionName=${{ env.next_version_name }}
           -PbuildNumber=${{ env.next_build_number }}
           -PreleaseKeystorePassword=${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
-          -PdebugKeystore=debug_keystore.jks
+          -PdebugKeystorePassword=${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
           build
 
       - name: Test Report

app/.gitignore

@@ -1,2 +1 @@
-build/*
-keystores/*
+build/*

app/build.gradle

@@ -43,6 +43,21 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        release {
+            storeFile file('keystores/opensqueeze_release.jks')
+            storePassword "opensqueeze"
+            keyAlias "android"
+            keyPassword "opensqueeze"
+        }
+        debug {
+            storeFile file('keystores/opensqueeze_debug.jks')
+            storePassword "opensqueeze"
+            keyAlias "android"
+            keyPassword "opensqueeze"
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled true
@@ -52,10 +67,14 @@ android {
             proguardFile 'proguard-guava.pro'
             proguardFile 'proguard-jackson.pro'
             proguardFile 'proguard-otto.pro'
+
+            signingConfig signingConfigs.release
         }
 
         debug {
             multiDexEnabled true
+
+            signingConfig signingConfigs.debug
         }
     }
 
@@ -75,26 +94,18 @@ android {
         jvmTarget = JavaVersion.VERSION_17
     }
 
-    signingConfigs {
-        release {
-            storeFile file('keystores/opensqueeze_release.jks')
-            keyAlias 'signing'
-        }
-        debug {
-            storeFile file('keystores/opensqueeze_debug.jks')
-        }
-    }
     lint {
         abortOnError true
     }
 
-    // enable release signing if we have password
-    if (project.hasProperty('openSqueezeReleaseStorePassword')) {
-        signingConfigs.release.storePassword = openSqueezeReleaseStorePassword
-        signingConfigs.release.keyPassword = openSqueezeReleaseStorePassword
-
-        // actually set the config here
-        buildTypes.release.signingConfig = signingConfigs.release
+    // override the password if we supply it
+    if (project.hasProperty('releaseKeystorePassword')) {
+        signingConfigs.release.storePassword = releaseKeystorePassword
+        signingConfigs.release.keyPassword = releaseKeystorePassword
+    }
+    if (project.hasProperty('debugKeystorePassword')) {
+        signingConfigs.debug.storePassword = debugKeystorePassword
+        signingConfigs.debug.keyPassword = debugKeystorePassword
     }
 }
 

app/keystores/README

@@ -0,0 +1,4 @@
+These keystores are for development purposes only and are not used for any official OpenSqueeze builds.
+They are here solely as a convenience to any develop trying to build OpenSqueeze.
+
+The passwords for these keystores and the contained aliases are all 'opensqueeze'.