Update compileSdk, minSdk, and targetSdk Apis

Summary: As we are using a newer version of Gradle, we should use the latest available APIs in the build.gradle files. Note: we have supressed the "UnstableApiUsage" lint warnings because these APIs are [safe to use](https://www.google.com/search?q=unstable+api+usage+lint+warning). Reviewed By: KylinChang Differential Revision: D69422721 fbshipit-source-id: cc90a2195b6a65de4ea29b5ea8482d21c274ef5b
facebook · Feb 10, 2025 · 3c7ebfa · 3c7ebfa
1 parent 129a7e4
commit 3c7ebfa
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 34 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -6,8 +6,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import org.gradle.kotlin.dsl.`kotlin-dsl`
 
-plugins { `kotlin-dsl` }
+@file:Suppress("UnstableApiUsage")
+plugins {
+    `kotlin-dsl`
+}
 
 repositories { mavenCentral() }
diff --git a/facebook-applinks/build.gradle.kts b/facebook-applinks/build.gradle.kts
@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -32,11 +35,12 @@ dependencies {
 android {
     buildToolsVersion = "35.0.0"
     namespace = "com.facebook.applinks"
-    compileSdkVersion(Config.compileSdk)
+    compileSdk = Config.compileSdk
+
 
     defaultConfig {
-        minSdkVersion(Config.minSdk)
-        targetSdkVersion(Config.targetSdk)
+        minSdk = Config.minSdk
+        targetSdk = Config.targetSdk
         consumerProguardFiles("proguard-rules.pro")
     }
 

diff --git a/facebook-bolts/build.gradle.kts b/facebook-bolts/build.gradle.kts
@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -49,12 +52,12 @@ dependencies {
 android {
     buildToolsVersion = "35.0.0"
     namespace = "com.facebook.bolts"
-    compileSdkVersion(Config.compileSdk)
+    compileSdk = Config.compileSdk
 
 
     defaultConfig {
-        minSdkVersion(Config.minSdk)
-        targetSdkVersion(Config.targetSdk)
+        minSdk = Config.minSdk
+        targetSdk = Config.targetSdk
         consumerProguardFiles("proguard-rules.pro")
     }
 

diff --git a/facebook-common/build.gradle.kts b/facebook-common/build.gradle.kts
@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -59,12 +62,12 @@ dependencies {
 android {
     buildToolsVersion = "35.0.0"
     namespace = "com.facebook.common"
-    compileSdkVersion(Config.compileSdk)
+    compileSdk = Config.compileSdk
 
 
     defaultConfig {
-        minSdkVersion(Config.minSdk)
-        targetSdkVersion(Config.targetSdk)
+        minSdk = Config.minSdk
+        targetSdk = Config.targetSdk
         consumerProguardFiles("proguard-rules.pro")
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true

diff --git a/facebook-core/build.gradle.kts b/facebook-core/build.gradle.kts
@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -58,12 +61,12 @@ dependencies {
 android {
     buildToolsVersion = "35.0.0"
     namespace = "com.facebook.core"
-    compileSdkVersion(Config.compileSdk)
+    compileSdk = Config.compileSdk
 
 
     defaultConfig {
-        minSdkVersion(Config.minSdk)
-        targetSdkVersion(Config.targetSdk)
+        minSdk = Config.minSdk
+        targetSdk = Config.targetSdk
         consumerProguardFiles("proguard-rules.pro")
         multiDexEnabled = true
     }

diff --git a/facebook-gamingservices/build.gradle.kts b/facebook-gamingservices/build.gradle.kts
@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -54,12 +57,12 @@ dependencies {
 android {
     buildToolsVersion = "35.0.0"
     namespace = "com.facebook.gamingservices"
-    compileSdkVersion(Config.compileSdk)
+    compileSdk = Config.compileSdk
 
 
     defaultConfig {
-        minSdkVersion(Config.minSdk)
-        targetSdkVersion(Config.targetSdk)
+        minSdk = Config.minSdk
+        targetSdk = Config.targetSdk
         consumerProguardFiles("proguard-rules.pro")
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/facebook-login/build.gradle.kts b/facebook-login/build.gradle.kts
@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -34,11 +37,12 @@ dependencies {
 android {
     buildToolsVersion = "35.0.0"
     namespace = "com.facebook.login"
-    compileSdkVersion(Config.compileSdk)
+    compileSdk = Config.compileSdk
+
 
     defaultConfig {
-        minSdkVersion(Config.minSdk)
-        targetSdkVersion(Config.targetSdk)
+        minSdk = Config.minSdk
+        targetSdk = Config.targetSdk
         consumerProguardFiles("proguard-rules.pro")
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/facebook-messenger/build.gradle.kts b/facebook-messenger/build.gradle.kts
@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -29,11 +32,12 @@ dependencies {
 android {
     buildToolsVersion = "35.0.0"
     namespace = "com.facebook.messenger"
-    compileSdkVersion(Config.compileSdk)
+    compileSdk = Config.compileSdk
+
 
     defaultConfig {
-        minSdkVersion(Config.minSdk)
-        targetSdkVersion(Config.targetSdk)
+        minSdk = Config.minSdk
+        targetSdk = Config.targetSdk
         consumerProguardFiles("proguard-rules.pro")
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/facebook-share/build.gradle.kts b/facebook-share/build.gradle.kts
@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -31,11 +34,12 @@ dependencies {
 android {
     buildToolsVersion = "35.0.0"
     namespace = "com.facebook.share"
-    compileSdkVersion(Config.compileSdk)
+    compileSdk = Config.compileSdk
+
 
     defaultConfig {
-        minSdkVersion(Config.minSdk)
-        targetSdkVersion(Config.targetSdk)
+        minSdk = Config.minSdk
+        targetSdk = Config.targetSdk
         consumerProguardFiles("proguard-rules.pro")
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/facebook-testutil/build.gradle.kts b/facebook-testutil/build.gradle.kts
@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -49,11 +52,12 @@ dependencies {
 android {
     buildToolsVersion = "35.0.0"
     namespace = "com.facebook"
-    compileSdkVersion(Config.compileSdk)
+    compileSdk = Config.compileSdk
+
 
     defaultConfig {
-        minSdkVersion(Config.minSdk)
-        targetSdkVersion(Config.targetSdk)
+        minSdk = Config.minSdk
+        targetSdk = Config.targetSdk
         vectorDrawables.useSupportLibrary = true
     }
 

diff --git a/facebook/build.gradle.kts b/facebook/build.gradle.kts
@@ -6,6 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -61,11 +64,12 @@ dependencies {
 android {
     buildToolsVersion = "35.0.0"
     namespace = "com.facebook"
-    compileSdkVersion(Config.compileSdk)
+    compileSdk = Config.compileSdk
+
 
     defaultConfig {
-        minSdkVersion(Config.minSdk)
-        targetSdkVersion(Config.targetSdk)
+        minSdk = Config.minSdk
+        targetSdk = Config.targetSdk
         consumerProguardFiles("proguard-project.txt")
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/samples/FBLoginSample/build.gradle b/samples/FBLoginSample/build.gradle
@@ -15,7 +15,7 @@ android {
     compileSdkVersion(31)
     defaultConfig {
         applicationId "com.facebook.fbloginsample"
-        minSdkVersion(Config.minSdk)
+        minSdk = Config.minSdk
         targetSdkVersion(31)
         versionCode 1
         versionName "0.1"

diff --git a/samples/HelloFacebookSample/build.gradle b/samples/HelloFacebookSample/build.gradle
@@ -21,7 +21,7 @@ android {
 
     defaultConfig {
         applicationId 'com.example.hellofacebook'
-        minSdkVersion(Config.minSdk)
+        minSdk = Config.minSdk
         targetSdkVersion(31)
     }