Merge pull request #2 from katemonster33/master

im not sure if that SDL_WINDOW_MAXIMIZED is safe
AnotherSeawhite · Mar 30, 2024 · 5175c7a · 5175c7a
2 parents 68581a7 + ba91ec5
commit 5175c7a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -371,10 +371,8 @@ jobs:
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
         working-directory: ./android
         run: |
-          echo "${{ secrets.KEYSTORE }}" > release.keystore.asc   
-          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch release.keystore.asc > app/release.keystore 
-          echo "${{ secrets.KEYSTORE_PROPERTIES }}" > keystore.properties.asc   
-          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch keystore.properties.asc > keystore.properties
+          keytool -genkey -keystore /tmp/a.keystore -keyalg RSA -keysize 2048 -validity 10000 -alias a -dname "cn=a, ou=a, o=a, c=a" -storepass 123456 -keypass 123456
+          echo -e "keyPassword=123456\nkeyAlias=a\nstorePassword=123456\nstoreFile=/tmp/a.keystore" > keystore.properties
           export UPSTREAM_BUILD_NUMBER="$((11581 + ${{ github.run_number }}))"
           chmod +x gradlew
           if [ ${{ matrix.android }} = arm64 ]

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -309,7 +309,6 @@ android {
     }
 
     signingConfigs {
-        if (keystoreProperties.getProperty('storeFile') != null) {
             if (file(keystoreProperties.getProperty('storeFile')).exists()) {
                 release {
                     storeFile file(keystoreProperties.getProperty("storeFile"))
@@ -320,7 +319,6 @@ android {
             } else {
                 throw new GradleException("Keystore file " + keystoreProperties.getProperty("storeFile") + " was not found.\n")
             }
-        }
         if (keystoreProperties.getProperty('debug_storeFile') != null) {
             if (file(keystoreProperties.getProperty('debug_storeFile')).exists()) {
                 debug {