Fix build

authgear · Nov 7, 2023 · 110746d · 110746d
1 parent 7489190
commit 110746d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -28,6 +28,9 @@ jobs:
     runs-on: macos-12
     needs: ["test"]
     if: github.ref == 'refs/heads/main'
+    env:
+      # The version depends on the Android Gradle Plugin version in /build.gradle.kts
+      BUILD_TOOLS_VERSION: "33.0.1"
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
@@ -37,7 +40,7 @@ jobs:
     - name: Set versionCode
       run: |
         VERSION_CODE=$(date +%s)
-        sed -I "" "s/versionCode 1/versionCode $VERSION_CODE/" ./javasample/build.gradle
+        sed -I "" "s/versionCode = 1/versionCode = $VERSION_CODE/" ./javasample/build.gradle.kts
     - name: Build unsigned APK
       run: ./gradlew javasample:assembleRelease
     - name: Install keystore
@@ -48,15 +51,13 @@ jobs:
         echo -n "$ANDROID_KEYSTORE_BASE64" | base64 --decode -o $KEYSTORE_PATH
     - name: Run zipalign
       run: |
-        BUILD_TOOLS_VERSION=$(sed -n -E 's/.*buildToolsVersion "(.*)"/\1/p' ./javasample/build.gradle)
         "$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION/zipalign" -c -v 4 ./javasample/build/outputs/apk/release/javasample-release-unsigned.apk
     - name: Run apksigner
       env:
         ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
         ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
         ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
       run: |
-        BUILD_TOOLS_VERSION=$(sed -n -E 's/.*buildToolsVersion "(.*)"/\1/p' ./javasample/build.gradle)
         "$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION/apksigner" sign \
           --ks $RUNNER_TEMP/keystore.jks \
           --ks-key-alias "$ANDROID_KEY_ALIAS" \

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
+    // Android Gradle Plugin 8.1 always use SDK Build Tools 33.0.1
+    // https://developer.android.com/build/releases/gradle-plugin#8-1-0
+    // If you ever update Android Gradle Plugin, please also update
+    // BUILD_TOOLS_VERSION in ./.github/workflows/ci.yaml
     id("com.android.library") version "8.1.2" apply false
     id("com.android.application") version "8.1.2" apply false
     id("org.jetbrains.kotlin.android") version "1.9.0" apply false