From 6e5481f3459981d20ac989ca214cad6123528de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Mon, 20 Sep 2021 11:38:13 +0200 Subject: [PATCH] Upgrade Gradle Play Publisher to 3.6.0 (#1526) --- .github/workflows/deploy-store.yml | 10 ++++------ app/build.gradle | 7 +++++-- app/key.p12.gpg | Bin 5129 -> 0 bytes build.gradle | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 app/key.p12.gpg diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml index 8015ef64..068b9c10 100644 --- a/.github/workflows/deploy-store.yml +++ b/.github/workflows/deploy-store.yml @@ -28,15 +28,14 @@ jobs: SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }} run: | gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg - gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg - name: Upload apk to google play env: + PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }} PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }} PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }} - PLAY_SERVICE_ACCOUNT_EMAIL: ${{ secrets.PLAY_SERVICE_ACCOUNT_EMAIL }} - PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }} - run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace; + ANDROID_PUBLISHER_CREDENTIALS: ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }} + run: ./gradlew publishPlayReleaseApps -PenableFirebase --stacktrace; deploy-app-gallery: name: Deploy to AppGallery @@ -60,7 +59,6 @@ jobs: SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }} run: | gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg - gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg - name: Prepare credentials env: @@ -68,7 +66,7 @@ jobs: run: echo $AGC_CREDENTIALS > ./app/src/release/agconnect-credentials.json - name: Build and publish HMS version env: + PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }} PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }} PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }} - PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }} run: ./gradlew bundleHmsRelease --stacktrace && ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace diff --git a/app/build.gradle b/app/build.gradle index 814fce3e..466924b0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -96,6 +96,10 @@ android { } } + playConfigs { + play { enabled.set(true) } + } + buildFeatures { viewBinding true } @@ -130,11 +134,10 @@ kapt { } play { - serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf" - serviceAccountCredentials = file('key.p12') defaultToAppBundles = false track = 'production' updatePriority = 3 + enabled.set(false) } huaweiPublish { diff --git a/app/key.p12.gpg b/app/key.p12.gpg deleted file mode 100644 index e9b6d06ebe2c5f9e8f062549a09b948be52be482..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5129 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