From 977d6c6f95c8b673db7ed7ab68463bf4842413f9 Mon Sep 17 00:00:00 2001
From: Flyinghead <raphael.jean@gmail.com>
Date: Fri, 14 Jun 2024 12:59:19 +0200
Subject: [PATCH] android: upload to google play

---
 .github/workflows/android.yml             |  24 +++++++---------------
 shell/android-studio/flycast/build.gradle |   8 +++++++-
 shell/android-studio/playstore.jks        | Bin 0 -> 2622 bytes
 3 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 shell/android-studio/playstore.jks

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 09391757a..5939387ac 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -31,14 +31,17 @@ jobs:
 
       - name: Gradle
         working-directory: shell/android-studio
-        run: ./gradlew assembleRelease --parallel
+        run: ./gradlew bundleRelease --parallel
         env:
           SENTRY_UPLOAD_URL: ${{ secrets.SENTRY_UPLOAD_URL }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: r0adkll/upload-google-play@v1.1.3
         with:
-          name: flycast-release.apk
-          path: shell/android-studio/flycast/build/outputs/apk/release/flycast-release.apk
+          serviceAccountJsonPlainText: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
+          packageName: com.flycast.emulator
+          releaseFiles: shell/android-studio/flycast/build/outputs/bundle/release/flycast-release.aab
+          track: qa
+          status: draft
 
       - name: Build dump_syms
         working-directory: core/deps/breakpad
@@ -58,19 +61,6 @@ jobs:
             mv libflycast.so.sym symbols/libflycast.so/$BUILD_ID
           done
 
-      - name: Configure AWS Credentials
-        id: aws-credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          aws-access-key-id: AKIAJOZQS4H2PHQWYFCA
-          aws-secret-access-key: ${{ secrets.S3_SECRET_KEY }}
-          aws-region: us-east-2
-        if: github.repository == 'flyinghead/flycast' && github.event_name == 'push'
-
-      - name: Upload to S3
-        run: aws s3 sync shell/android-studio/flycast/build/outputs/apk/release s3://flycast-builds/android/${GITHUB_REF#refs/}-$GITHUB_SHA --acl public-read --exclude='*.json' --follow-symlinks
-        if: ${{ steps.aws-credentials.outputs.aws-account-id != '' }}
-
       - name: Setup Sentry CLI
         uses: mathieu-bour/setup-sentry-cli@v2
         env:
diff --git a/shell/android-studio/flycast/build.gradle b/shell/android-studio/flycast/build.gradle
index 5159b29fd..c209f1794 100644
--- a/shell/android-studio/flycast/build.gradle
+++ b/shell/android-studio/flycast/build.gradle
@@ -49,13 +49,19 @@ android {
         debug {
             storeFile file("../debug.keystore")
         }
+        release {
+            storeFile file("../playstore.jks")
+            storePassword System.getenv("ANDROID_KEYSTORE_PASSWORD")
+            keyAlias 'uploadkey'
+            keyPassword System.getenv("ANDROID_KEYSTORE_PASSWORD")
+        }
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
     compileOptions {
diff --git a/shell/android-studio/playstore.jks b/shell/android-studio/playstore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..ec5e2a7fc740635fb85e0ca62b914c0dac3acdd5
GIT binary patch
literal 2622
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
Cyq~!M

literal 0
HcmV?d00001