Fixes for Google Drive integration

- Updated libraries
- Updated build.gradle for CLIENT_ID declaration
- Update GHA to expose CLIENT_ID to build

Author: TranceLove

.github/workflows/android-build.yml

@@ -15,6 +15,9 @@ jobs:
     name: Check spotless
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -69,6 +72,9 @@ jobs:
     name: Build debug
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5

.github/workflows/android-debug-artifact-ondemand.yml

@@ -29,6 +29,9 @@ jobs:
           echo "::set-output name=repo_name::${{ fromJson(steps.request.outputs.data).head.repo.full_name }}"
           echo "::set-output name=repo_clone_url::${{ fromJson(steps.request.outputs.data).head.repo.clone_url }}"
           echo "::set-output name=repo_ssh_url::${{ fromJson(steps.request.outputs.data).head.repo.ssh_url }}"
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - name: Checkout PR Branch
         uses: actions/checkout@v6
         with:

.github/workflows/android-debug-artifact-release.yml

@@ -8,6 +8,9 @@ jobs:
   apk:
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5

.github/workflows/android-feature.yml

@@ -16,6 +16,9 @@ jobs:
     name: Check spotless
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -40,6 +43,9 @@ jobs:
     name: Build debug and run Jacoco tests
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5

.github/workflows/android-main.yml

@@ -16,6 +16,9 @@ jobs:
     name: Check spotless
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -37,7 +40,10 @@ jobs:
     name: Build debug, Jacoco test and publish to codacy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK 17
@@ -106,6 +112,9 @@ jobs:
       matrix:
         api-level: [ 21, 28 ]
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - name: checkout
         uses: actions/checkout@v6
       - name: Java 17

app/build.gradle

@@ -1,4 +1,5 @@
 import java.util.concurrent.TimeUnit
+import com.android.build.gradle.internal.cxx.configure.GradleLocalPropertiesKt
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
@@ -35,6 +36,10 @@ android {
                               "room.expandProjection": "true"]
             }
         }
+
+        def googleClientId = getValueFromEnvOrProperties("AMAZE_CLOUD_GOOGLE_CLIENT_ID")
+        def bareGoogleClientId = googleClientId.replace(".apps.googleusercontent.com", "")
+        manifestPlaceholders["googleClientIdForRedirect"] = "com.googleusercontent.apps.${bareGoogleClientId}"
     }
 
     signingConfigs {
@@ -238,6 +243,20 @@ dependencies {
         transitive = true
     }
 
+    implementation(libs.google.api.client) {
+        transitive = false
+    }
+
+    implementation(libs.google.oauth.client) {
+        transitive = false
+    }
+
+    implementation(libs.google.http.client) {
+        transitive = false
+    }
+
+    implementation(libs.google.http.client.gson)
+
     //zip4j: support password-protected zips
     implementation libs.zip4j
 
@@ -348,9 +367,15 @@ if (propFile.canRead()) {
     println 'signing.properties not found'
     android.buildTypes.release.signingConfig = null
 }
+
 repositories {
     google()
     mavenCentral()
     maven { url "https://jitpack.io" }
     maven { url "https://jcenter.bintray.com" }
 }
+
+String getValueFromEnvOrProperties(String name) {
+    def localProperties = GradleLocalPropertiesKt.gradleLocalProperties(rootDir, project.providers)
+    return System.getenv(name) ?: localProperties[name]
+}