Merge pull request #131 from android/update-gradle-build

Update gradle so Credential Manager sample builds successfully

Author: niharika2810

.github/workflows/build-credential-manager.yml

@@ -0,0 +1,58 @@
+# Workflow name
+name: Build CredentialManager Sample
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set Up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Install Android SDK Platform VanillaIceCream
+        run: |
+          echo "y" | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null
+          echo "y" | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platforms;android-35"
+
+      # The sample includes a keystore.properties.template.
+      # For a CI build, we might need to provide a dummy or generated keystore.
+      # For now, let's assume the build works without a specific signing config for debug.
+      # If it requires specific signing for debug, this might fail or need adjustment.
+      - name: Create dummy keystore.properties if not exists
+        run: |
+          if [ ! -f CredentialManager/keystore.properties ]; then
+            echo "Creating dummy keystore.properties for CI build"
+            echo "storeFile=debug.keystore" > CredentialManager/keystore.properties
+            echo "storePassword=android" >> CredentialManager/keystore.properties
+            echo "keyAlias=androiddebugkey" >> CredentialManager/keystore.properties
+            echo "keyPassword=android" >> CredentialManager/keystore.properties
+          fi
+          # Ensure a debug.keystore exists if not provided by checkout
+          if [ ! -f CredentialManager/debug.keystore ]; then
+            echo "Generating dummy debug.keystore for CI build"
+            keytool -genkey -v -keystore CredentialManager/debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Debug,O=Android,C=US"
+          fi
+        working-directory: . # Run from checkout root so CredentialManager/ path is correct
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+        working-directory: ./CredentialManager
+
+      - name: Build CredentialManager app
+        working-directory: ./CredentialManager
+        run: ./gradlew app:assembleDebug

.github/workflows/build-webkit-webview.yml

@@ -0,0 +1,48 @@
+# Workflow name
+name: Build WebkitWebView Sample
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set Up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Create dummy keystore.properties if not exists
+        run: |
+          if [ ! -f WebView/WebkitWebView/keystore.properties ]; then
+            echo "Creating dummy keystore.properties for CI build"
+            echo "storeFile=debug.keystore" > WebView/WebkitWebView/keystore.properties
+            echo "storePassword=android" >> WebView/WebkitWebView/keystore.properties
+            echo "keyAlias=androiddebugkey" >> WebView/WebkitWebView/keystore.properties
+            echo "keyPassword=android" >> WebView/WebkitWebView/keystore.properties
+          fi
+          if [ ! -f WebView/WebkitWebView/debug.keystore ]; then
+            echo "Generating dummy debug.keystore for CI build"
+            keytool -genkey -v -keystore WebView/WebkitWebView/debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Debug,O=Android,C=US"
+          fi
+        working-directory: . # Run from checkout root
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+        working-directory: ./WebView/WebkitWebView
+
+      - name: Build WebkitWebView app
+        working-directory: ./WebView/WebkitWebView
+        run: ./gradlew app:assembleDebug

CredentialManager/app/build.gradle

@@ -31,12 +31,10 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     namespace 'com.google.credentialmanager.sample'
-    compileSdk 34
-    compileSdkPreview "VanillaIceCream"
+    compileSdk 35
     defaultConfig {
         applicationId "com.google.credentialmanager.sample"
         minSdk 21
-        targetSdkPreview "VanillaIceCream"
         versionCode 1
         versionName "1.0"
 
@@ -101,8 +99,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    implementation 'androidx.credentials:credentials-play-services-auth:1.5.0-alpha02'
-    implementation 'androidx.credentials:credentials:1.5.0-alpha02'
+    implementation 'androidx.credentials:credentials-play-services-auth:1.5.0'
+    implementation 'androidx.credentials:credentials:1.5.0'
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"

CredentialManager/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
-#Wed Dec 28 18:22:13 IST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists