From aee9d28d9da5efdb5ef05dde9c8881a0ce3b75fa Mon Sep 17 00:00:00 2001
From: MohitMaliFtechiz <futuretechoworld.mohitmali@gmail.com>
Date: Tue, 11 Apr 2023 12:19:50 +0530
Subject: [PATCH] Changed secret key as PLAYSTORE_JSON

We have updated the release.yml file to use the new PLAYSTORE_JSON secret key instead of the google_json secret key that was previously used to get credentials. As part of this update, we have renamed the google.json file to playstore.json for better naming consistency with the new secret key.
---
 .github/workflows/release.yml | 4 ++--
 app/build.gradle.kts          | 2 +-
 buildSrc/build.gradle.kts     | 7 ++++++-
 custom/build.gradle.kts       | 2 +-
 google.json => playstore.json | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)
 rename google.json => playstore.json (99%)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a7ccae5ac..8dc9e2b0a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,10 +26,10 @@ jobs:
       - name: Decrypt files
         env:
           keystore: ${{ secrets.keystore }}
-          google_json: ${{ secrets.google_json }}
+          playstore_json: ${{ secrets.PLAYSTORE_JSON }}
           ssh_key: ${{ secrets.ssh_key }}
         run: |
-          echo "$google_json" | base64 -d > google.json
+          echo "$playstore_json" > playstore.json
           echo "$keystore" | base64 -d > kiwix-android.keystore
           echo "$ssh_key" | base64 -d > ssh_key
           chmod 600 ssh_key
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index acd0e565f..0ae235bdf 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -92,7 +92,7 @@ android {
 
 play {
   enabled.set(true)
-  serviceAccountCredentials.set(file("../google.json"))
+  serviceAccountCredentials.set(file("../playstore.json"))
   track.set("alpha")
   releaseStatus.set(com.github.triplet.gradle.androidpublisher.ReleaseStatus.DRAFT)
   resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.FAIL)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 991e12ecc..33a40c49b 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -15,7 +15,12 @@ dependencies {
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0")
   implementation("org.jacoco:org.jacoco.core:0.8.8")
   implementation("org.jlleitschuh.gradle:ktlint-gradle:10.3.0")
-  implementation("com.google.apis:google-api-services-androidpublisher:v3-rev129-1.25.0")
+  implementation("com.google.apis:google-api-services-androidpublisher:v3-rev20230406-2.0.0") {
+    exclude(group = "com.google.guava", module = "guava")
+  }
+  implementation("com.google.http-client:google-http-client-jackson2:1.40.0") {
+    exclude(group = "com.google.guava", module = "guava")
+  }
   implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.20.0")
   implementation("com.googlecode.json-simple:json-simple:1.1")
 
diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts
index 764541de1..d720ca6a3 100644
--- a/custom/build.gradle.kts
+++ b/custom/build.gradle.kts
@@ -72,7 +72,7 @@ fun ProductFlavor.createPublishApkWithExpansionTask(
     doLast {
       val packageName = "org.kiwix$applicationIdSuffix"
       println("packageName $packageName")
-      createPublisher(File(rootDir, "google.json"))
+      createPublisher(File(rootDir, "playstore.json"))
         .transactionWithCommit(packageName) {
           val variants =
             applicationVariants.releaseVariantsFor(this@createPublishApkWithExpansionTask)
diff --git a/google.json b/playstore.json
similarity index 99%
rename from google.json
rename to playstore.json
index de8174e08..55b7fbfd1 100644
--- a/google.json
+++ b/playstore.json
@@ -171,4 +171,4 @@
     }
   ],
   "configuration_version": "1"
-}
\ No newline at end of file
+}