From 3c7ebfa1f9b0a3cc9b7b7b68f8e50af8e7f264af Mon Sep 17 00:00:00 2001 From: Max Albright Date: Mon, 10 Feb 2025 15:57:34 -0800 Subject: [PATCH] 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 --- buildSrc/build.gradle.kts | 6 ++++-- facebook-applinks/build.gradle.kts | 10 +++++++--- facebook-bolts/build.gradle.kts | 9 ++++++--- facebook-common/build.gradle.kts | 9 ++++++--- facebook-core/build.gradle.kts | 9 ++++++--- facebook-gamingservices/build.gradle.kts | 9 ++++++--- facebook-login/build.gradle.kts | 10 +++++++--- facebook-messenger/build.gradle.kts | 10 +++++++--- facebook-share/build.gradle.kts | 10 +++++++--- facebook-testutil/build.gradle.kts | 10 +++++++--- facebook/build.gradle.kts | 10 +++++++--- samples/FBLoginSample/build.gradle | 2 +- samples/HelloFacebookSample/build.gradle | 2 +- 13 files changed, 72 insertions(+), 34 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index fee793da04..b7f84293c8 100644 --- 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 index 5b9dc9c1b0..a5d4fbf4c3 100644 --- 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 index c921404501..4b85a18295 100644 --- 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 index 02f337c3a3..ef868a17a0 100644 --- 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 index 3b7f765b42..364fd27689 100644 --- 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 index f6b9a37796..7d9e8357d8 100644 --- 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 index 5e488633ce..11beea7ace 100644 --- 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 index 076c2b8ec7..5736437b4c 100644 --- 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 index 4a9f6ef199..89f2c66099 100644 --- 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 index 28e60fc62b..d2f8253e6a 100644 --- 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 index 0189e4af5a..68097a1520 100644 --- 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 index 364d746b83..1c2007c4bd 100644 --- 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 index 42f994d700..a3aaae36c6 100644 --- 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) }