Skip to content

Commit

Permalink
Finish migrating build.gradle APIs
Browse files Browse the repository at this point in the history 
Summary: Some of the other APIs used in the build gradle have been deprecated and replaced with newer APIs. We should use those now that we have upgraded so many dependencies.

Reviewed By: KylinChang

Differential Revision: D69423564

fbshipit-source-id: c623a439f08f4f873a93b5a460d96b83f899464c
  • Loading branch information
@maxalbrightmeta @facebook-github-bot
maxalbrightmeta authored and facebook-github-bot committed Feb 10, 2025
1 parent 3c7ebfa commit 08530fc
Show file tree
Hide file tree
Showing 13 changed files with 73 additions and 42 deletions.
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/Dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ object Config {
const val minSdk = 15
const val compileSdk = 34
const val targetSdk = 34
const val buildToolsVersion = "35.0.0"
}

object Versions {
Expand Down
7 changes: 5 additions & 2 deletions facebook-applinks/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook.applinks"
compileSdk = Config.compileSdk

Expand All @@ -44,7 +44,10 @@ android {
consumerProguardFiles("proguard-rules.pro")
}

sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
sourceSets {
getByName("test")
{ java.srcDir("src/test/kotlin") }
}

buildTypes {
getByName("release") {
Expand Down
11 changes: 7 additions & 4 deletions facebook-bolts/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook.bolts"
compileSdk = Config.compileSdk

Expand All @@ -63,11 +63,11 @@ android {

buildTypes {
getByName("debug") {
isTestCoverageEnabled = true
enableUnitTestCoverage = true
}
}

lintOptions { isAbortOnError = false }
lint { abortOnError = false }

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
Expand All @@ -81,7 +81,10 @@ android {
}
}

sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
sourceSets {
getByName("test")
{ java.srcDir("src/test/kotlin") }
}

if (System.getenv("SANDCASTLE") == "1") {
testOptions {
Expand Down
13 changes: 8 additions & 5 deletions facebook-common/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook.common"
compileSdk = Config.compileSdk

Expand All @@ -73,9 +73,9 @@ android {
multiDexEnabled = true
}

aaptOptions { additionalParameters("--no-version-vectors") }
androidResources { additionalParameters("--no-version-vectors") }

lintOptions { isAbortOnError = false }
lint { abortOnError = false }

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
Expand All @@ -89,10 +89,13 @@ android {
unitTests.isIncludeAndroidResources = true
}

sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
sourceSets {
getByName("test")
{ java.srcDir("src/test/kotlin") }
}

buildTypes {
getByName("debug") { isTestCoverageEnabled = true }
getByName("debug") { enableUnitTestCoverage = true }
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
Expand Down
11 changes: 7 additions & 4 deletions facebook-core/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook.core"
compileSdk = Config.compileSdk

Expand All @@ -73,11 +73,11 @@ android {

buildTypes {
getByName("debug") {
isTestCoverageEnabled = true
enableUnitTestCoverage = true
}
}

lintOptions { isAbortOnError = false }
lint { abortOnError = false }

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
Expand Down Expand Up @@ -106,7 +106,10 @@ android {
}
}
}
sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
sourceSets {
getByName("test")
{ java.srcDir("src/test/kotlin") }
}

if (System.getenv("SANDCASTLE") == "1") {
testOptions {
Expand Down
13 changes: 8 additions & 5 deletions facebook-gamingservices/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook.gamingservices"
compileSdk = Config.compileSdk

Expand All @@ -67,17 +67,17 @@ android {
vectorDrawables.useSupportLibrary = true
}

aaptOptions { additionalParameters("--no-version-vectors") }
androidResources { additionalParameters("--no-version-vectors") }

lintOptions { isAbortOnError = false }
lint { abortOnError = false }

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_1_8)
}

buildTypes {
getByName("debug") { isTestCoverageEnabled = true }
getByName("debug") { enableUnitTestCoverage = true }
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
Expand All @@ -98,7 +98,10 @@ android {
}
}

sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
sourceSets {
getByName("test")
{ java.srcDir("src/test/kotlin") }
}

if (System.getenv("SANDCASTLE") == "1") {
testOptions {
Expand Down
11 changes: 7 additions & 4 deletions facebook-login/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook.login"
compileSdk = Config.compileSdk

Expand All @@ -47,16 +47,19 @@ android {
vectorDrawables.useSupportLibrary = true
}

aaptOptions { additionalParameters("--no-version-vectors") }
androidResources { additionalParameters("--no-version-vectors") }

lintOptions { isAbortOnError = false }
lint { abortOnError = false }

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_1_8)
}

sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
sourceSets {
getByName("test")
{ java.srcDir("src/test/kotlin") }
}

buildTypes {
getByName("release") {
Expand Down
11 changes: 7 additions & 4 deletions facebook-messenger/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook.messenger"
compileSdk = Config.compileSdk

Expand All @@ -42,16 +42,19 @@ android {
vectorDrawables.useSupportLibrary = true
}

aaptOptions { additionalParameters("--no-version-vectors") }
androidResources { additionalParameters("--no-version-vectors") }

lintOptions { isAbortOnError = false }
lint { abortOnError = false }

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_1_8)
}

sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
sourceSets {
getByName("test")
{ java.srcDir("src/test/kotlin") }
}

buildTypes {
getByName("release") {
Expand Down
11 changes: 7 additions & 4 deletions facebook-share/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook.share"
compileSdk = Config.compileSdk

Expand All @@ -44,16 +44,19 @@ android {
vectorDrawables.useSupportLibrary = true
}

aaptOptions { additionalParameters("--no-version-vectors") }
androidResources { additionalParameters("--no-version-vectors") }

lintOptions { isAbortOnError = false }
lint { abortOnError = false }

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_1_8)
}

sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
sourceSets {
getByName("test")
{ java.srcDir("src/test/kotlin") }
}

buildTypes {
getByName("release") {
Expand Down
11 changes: 7 additions & 4 deletions facebook-testutil/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook"
compileSdk = Config.compileSdk

Expand All @@ -61,11 +61,14 @@ android {
vectorDrawables.useSupportLibrary = true
}

aaptOptions { additionalParameters("--no-version-vectors") }
androidResources { additionalParameters("--no-version-vectors") }

lintOptions { isAbortOnError = false }
lint { abortOnError = false }

sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
sourceSets {
getByName("test")
{ java.srcDir("src/test/kotlin") }
}

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
Expand Down
11 changes: 7 additions & 4 deletions facebook/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook"
compileSdk = Config.compileSdk

Expand All @@ -74,9 +74,9 @@ android {
vectorDrawables.useSupportLibrary = true
}

aaptOptions { additionalParameters("--no-version-vectors") }
androidResources { additionalParameters("--no-version-vectors") }

lintOptions { isAbortOnError = false }
lint { abortOnError = false }

compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
Expand All @@ -90,7 +90,10 @@ android {
}
}

sourceSets { named("test") { java.srcDir("src/test/kotlin") } }
sourceSets {
getByName("test")
{ java.srcDir("src/test/kotlin") }
}

if (System.getenv("SANDCASTLE") == "1") {
testOptions {
Expand Down
2 changes: 1 addition & 1 deletion samples/FBLoginSample/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.facebook.fbloginsample"
compileSdkVersion(31)
defaultConfig {
Expand Down
2 changes: 1 addition & 1 deletion samples/HelloFacebookSample/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
}

android {
buildToolsVersion = "35.0.0"
buildToolsVersion = Config.buildToolsVersion
namespace = "com.example.hellofacebook"
compileSdkVersion(31)

Expand Down

0 comments on commit 08530fc

Please sign in to comment.