Consoliate Android SDK version inside the Version Catalog (#38949)

Summary: Pull Request resolved: #38949 I've done another pass and moved all the compileSdk/minSdk/targetSdk and buildToolVersion in a single place so that we can easily bump one for all the projects. Changelog: [Internal] [Changed] - Consoliate Android SDK version inside the Version Catalog Reviewed By: cipolleschi Differential Revision: D48263891 fbshipit-source-id: 84a5623869042b12bda0d3ee9e132d20fbc0e9d4
facebook · Aug 11, 2023 · a878fcc · a878fcc
1 parent 6696147
commit a878fcc
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/packages/react-native/ReactAndroid/build.gradle b/packages/react-native/ReactAndroid/build.gradle
@@ -468,8 +468,8 @@ repositories {
 }
 
 android {
-    compileSdk 33
-    buildToolsVersion = "33.0.1"
+    compileSdk libs.versions.compileSdk.get().toInteger()
+    buildToolsVersion = libs.versions.buildTools.get()
     namespace "com.facebook.react"
 
     // Used to override the NDK path/version on internal CI or by allowing
@@ -494,8 +494,8 @@ android {
     }
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 33
+        minSdk = libs.versions.minSdk.get().toInteger()
+        targetSdk = libs.versions.targetSdk.get().toInteger()
         versionCode(1)
         versionName("1.0")
 

diff --git a/packages/react-native/ReactAndroid/flipper-integration/build.gradle.kts b/packages/react-native/ReactAndroid/flipper-integration/build.gradle.kts
@@ -29,11 +29,11 @@ repositories {
 }
 
 android {
-  compileSdk = 33
-  buildToolsVersion = "33.0.1"
+  compileSdk = libs.versions.compileSdk.get().toInt()
+  buildToolsVersion = libs.versions.buildTools.get()
   namespace = "com.facebook.react.flipper"
 
-  defaultConfig { minSdk = 21 }
+  defaultConfig { minSdk = libs.versions.minSdk.get().toInt() }
 
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_11

diff --git a/packages/react-native/ReactAndroid/hermes-engine/build.gradle b/packages/react-native/ReactAndroid/hermes-engine/build.gradle
@@ -161,8 +161,8 @@ repositories {
 }
 
 android {
-    compileSdk 33
-    buildToolsVersion = "33.0.1"
+    compileSdk libs.versions.compileSdk.get().toInteger()
+    buildToolsVersion = libs.versions.buildTools.get()
     namespace "com.facebook.hermes"
 
     // Used to override the NDK path/version on internal CI or by allowing
@@ -175,7 +175,7 @@ android {
     }
 
     defaultConfig {
-        minSdk = 21
+        minSdk = libs.versions.minSdk.get().toInteger()
 
         externalNativeBuild {
             cmake {

diff --git a/packages/react-native/gradle/libs.versions.toml b/packages/react-native/gradle/libs.versions.toml
@@ -1,4 +1,10 @@
 [versions]
+# Android versions
+minSdk = "21"
+targetSdk = "33"
+compileSdk = "33"
+buildTools = "33.0.1"
+# Dependencies versions
 agp = "8.1.0"
 androidx-annotation = "1.6.0"
 androidx-appcompat = "1.6.1"

diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
@@ -90,8 +90,8 @@ repositories {
 }
 
 android {
-    compileSdk 33
-    buildToolsVersion = "33.0.1"
+    compileSdk libs.versions.compileSdk.get().toInteger()
+    buildToolsVersion = libs.versions.buildTools.get()
     namespace "com.facebook.react.uiapp"
 
     // Used to override the NDK path/version on internal CI or by allowing
@@ -117,8 +117,8 @@ android {
 
     defaultConfig {
         applicationId "com.facebook.react.uiapp"
-        minSdk = 21
-        targetSdk = 33
+        minSdk = libs.versions.minSdk.get().toInteger()
+        targetSdk = libs.versions.targetSdk.get().toInteger()
         versionCode 1
         versionName "1.0"
         testBuildType System.getProperty('testBuildType', 'debug')  // This will later be used to control the test apk build type