From a5d5ead1a474832a911c3a6e44b6d6450bca3fd6 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Wed, 11 Oct 2023 10:04:47 -0700 Subject: [PATCH] Make sure template is consuming the right buildToolsVersion (#39956) Summary: Currently, the template has a `buildToolsVersion = '34.0.0'` specified in the top level .gradle file but it's not currently using it. This is causing the build to fallback to the default version provided by AGP which is 33.x This is also causing the CI to download buildtools 34.0.0 as they're not in the container (causing network flakyness). I'm also bumping the docker container to v12 as we bumped NDK 26 which is missing in the v11 container. ## Changelog: [INTERNAL] [FIXED] - Make sure template is consuming the right buildToolsVersion Pull Request resolved: https://github.com/facebook/react-native/pull/39956 Test Plan: CI should be green Reviewed By: christophpurrer Differential Revision: D50019777 Pulled By: cortinico fbshipit-source-id: a2ab7a7bd7c55624d5c050b45e69086c5f25ba6a --- .circleci/configurations/top_level.yml | 2 +- packages/react-native/template/android/app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/configurations/top_level.yml b/.circleci/configurations/top_level.yml index aac11f93535..4bfbebeb383 100644 --- a/.circleci/configurations/top_level.yml +++ b/.circleci/configurations/top_level.yml @@ -25,7 +25,7 @@ references: android-defaults: &android-defaults working_directory: ~/react-native docker: - - image: reactnativecommunity/react-native-android:v11.0 + - image: reactnativecommunity/react-native-android:v12.0 environment: - TERM: "dumb" - GRADLE_OPTS: '-Dorg.gradle.daemon=false' diff --git a/packages/react-native/template/android/app/build.gradle b/packages/react-native/template/android/app/build.gradle index 94222a1e807..86512f88a4a 100644 --- a/packages/react-native/template/android/app/build.gradle +++ b/packages/react-native/template/android/app/build.gradle @@ -71,7 +71,7 @@ def jscFlavor = 'org.webkit:android-jsc:+' android { ndkVersion rootProject.ext.ndkVersion - + buildToolsVersion rootProject.ext.buildToolsVersion compileSdk rootProject.ext.compileSdkVersion namespace "com.helloworld"