From 2b862cfce59a61b7e714ecf1ba00ffa7985d055b Mon Sep 17 00:00:00 2001
From: Pedro Atanasio <pedro.atanasio@incognia.com>
Date: Mon, 22 Jul 2024 10:22:28 -0300
Subject: [PATCH] feat(incognia-android-35): update build tools

---
 .github/workflows/main.yml     | 2 +-
 .github/workflows/manually.yml | 2 +-
 lib/sdk-installer.js           | 2 +-
 src/sdk-installer.ts           | 2 +-
 test-fixture/app/build.gradle  | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ce578541a..6766dbbeb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -121,4 +121,4 @@ jobs:
         script: |
           echo $GITHUB_REPOSITORY
           adb devices
-          ./gradlew connectedDebugAndroidTest
+          ./gradlew -Pandroid.aapt2FromMavenOverride=$ANDROID_SDK_ROOT/build-tools/35.0.0/aapt2 connectedDebugAndroidTest
diff --git a/.github/workflows/manually.yml b/.github/workflows/manually.yml
index 5b1338f3d..1a16246a7 100644
--- a/.github/workflows/manually.yml
+++ b/.github/workflows/manually.yml
@@ -28,7 +28,7 @@ on:
       script:
         description: 'custom script to run - e.g. `./gradlew connectedCheck`'
         required: true
-        default: './gradlew connectedDebugAndroidTest'
+        default: './gradlew -Pandroid.aapt2FromMavenOverride=$ANDROID_SDK_ROOT/build-tools/35.0.0/aapt2 connectedDebugAndroidTest'
 
 jobs:
   test:
diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js
index d3b60abb4..5c01459d4 100644
--- a/lib/sdk-installer.js
+++ b/lib/sdk-installer.js
@@ -38,7 +38,7 @@ const exec = __importStar(require("@actions/exec"));
 const io = __importStar(require("@actions/io"));
 const tc = __importStar(require("@actions/tool-cache"));
 const fs = __importStar(require("fs"));
-const BUILD_TOOLS_VERSION = '33.0.0';
+const BUILD_TOOLS_VERSION = '35.0.0';
 const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-8512546_latest.zip';
 const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip';
 /**
diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts
index 29526d7e1..687e4bbae 100644
--- a/src/sdk-installer.ts
+++ b/src/sdk-installer.ts
@@ -4,7 +4,7 @@ import * as io from '@actions/io';
 import * as tc from '@actions/tool-cache';
 import * as fs from 'fs';
 
-const BUILD_TOOLS_VERSION = '33.0.0';
+const BUILD_TOOLS_VERSION = '35.0.0';
 const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-8512546_latest.zip';
 const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip';
 
diff --git a/test-fixture/app/build.gradle b/test-fixture/app/build.gradle
index 82b4d4f50..ca34e37fc 100644
--- a/test-fixture/app/build.gradle
+++ b/test-fixture/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "33.0.0"
+    compileSdkVersion 35
+    buildToolsVersion "35.0.0"
 
     defaultConfig {
         applicationId "com.example.testapp"
         minSdkVersion 15
-        targetSdkVersion 33
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"