Skip to content

[Infra] Update Android Gradle configurations #8417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rlazo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Infra] Update Android Gradle configurations #8417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ firebaseLibrary {
}

android {
adbOptions {
installation {
timeOutInMs 60 * 1000
}

namespace "com.google.firebase.appcheck.debug.testing"
compileSdkVersion project.compileSdkVersion
defaultConfig {
targetSdkVersion project.targetSdkVersion
minSdkVersion project.minSdkVersion
versionName version
multiDexEnabled = true
Expand All @@ -46,7 +45,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
testOptions.unitTests.includeAndroidResources = true
testOptions {
targetSdk project.targetSdkVersion
unitTests.includeAndroidResources = true
}
}

dependencies {
Expand Down
8 changes: 5 additions & 3 deletions appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,13 @@ firebaseLibrary {
}

android {
adbOptions {
installation {
timeOutInMs 60 * 1000
}

namespace "com.google.firebase.appcheck.debug"
compileSdkVersion project.compileSdkVersion
defaultConfig {
targetSdkVersion project.targetSdkVersion
minSdkVersion project.minSdkVersion
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -43,7 +42,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

testOptions.unitTests.includeAndroidResources = false
testOptions {
targetSdk project.targetSdkVersion
unitTests.includeAndroidResources = false
}
}

dependencies {
Expand Down
8 changes: 5 additions & 3 deletions appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@ firebaseLibrary {
}

android {
adbOptions {
installation {
timeOutInMs 60 * 1000
}

namespace "com.google.firebase.appcheck.interop"
compileSdkVersion project.compileSdkVersion
defaultConfig {
targetSdkVersion project.targetSdkVersion
minSdkVersion project.minSdkVersion
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -41,7 +40,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

testOptions.unitTests.includeAndroidResources = false
testOptions {
targetSdk project.targetSdkVersion
unitTests.includeAndroidResources = false
}
}

dependencies {
Expand Down
8 changes: 5 additions & 3 deletions appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,13 @@ firebaseLibrary {
}

android {
adbOptions {
installation {
timeOutInMs 60 * 1000
}

namespace "com.google.firebase.appcheck.playintegrity"
compileSdkVersion project.compileSdkVersion
defaultConfig {
targetSdkVersion project.targetSdkVersion
minSdkVersion project.minSdkVersion
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -43,7 +42,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

testOptions.unitTests.includeAndroidResources = false
testOptions {
targetSdk project.targetSdkVersion
unitTests.includeAndroidResources = false
}
}

dependencies {
Expand Down
8 changes: 5 additions & 3 deletions appcheck/firebase-appcheck-recaptcha/firebase-appcheck-recaptcha.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@ firebaseLibrary {
}

android {
adbOptions {
installation {
timeOutInMs 60 * 1000
}

namespace "com.google.firebase.appcheck.recaptcha"
compileSdkVersion project.compileSdkVersion
defaultConfig {
targetSdkVersion project.targetSdkVersion
minSdkVersion project.minSdkVersion
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -44,7 +43,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

testOptions.unitTests.includeAndroidResources = false
testOptions {
targetSdk project.targetSdkVersion
unitTests.includeAndroidResources = false
}
}

dependencies {
Expand Down
8 changes: 5 additions & 3 deletions appcheck/firebase-appcheck/firebase-appcheck.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ firebaseLibrary {
}

android {
adbOptions {
installation {
timeOutInMs 60 * 1000
}

namespace "com.google.firebase.appcheck"
compileSdkVersion project.compileSdkVersion
defaultConfig {
targetSdkVersion project.targetSdkVersion
minSdkVersion project.minSdkVersion
multiDexEnabled = true
versionName version
Expand All @@ -45,7 +44,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
testOptions.unitTests.includeAndroidResources = true
testOptions {
targetSdk project.targetSdkVersion
unitTests.includeAndroidResources = true
}
}

kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }
Expand Down
2 changes: 1 addition & 1 deletion appcheck/firebase-appcheck/test-app/test-app.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ android {
defaultConfig {
applicationId "com.googletest.firebase.appcheck"
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
targetSdk project.targetSdkVersion
versionCode 1
versionName "1.0"

Expand Down
2 changes: 1 addition & 1 deletion encoders/firebase-decoders-json/firebase-decoders-json.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ android {
compileSdkVersion project.compileSdkVersion
defaultConfig {
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -38,6 +37,7 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
testOptions {
targetSdk project.targetSdkVersion
unitTests {
includeAndroidResources = true
}
Expand Down
2 changes: 1 addition & 1 deletion encoders/firebase-encoders-json/firebase-encoders-json.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ android {
compileSdkVersion project.compileSdkVersion
defaultConfig {
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -41,6 +40,7 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
testOptions {
targetSdk project.targetSdkVersion
unitTests {
includeAndroidResources = true
}
Expand Down
2 changes: 1 addition & 1 deletion encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ android {
compileSdkVersion project.compileSdkVersion
defaultConfig {
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -38,6 +37,7 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
testOptions {
targetSdk project.targetSdkVersion
unitTests {
includeAndroidResources = true
}
Expand Down
2 changes: 1 addition & 1 deletion firebase-appdistribution-api/firebase-appdistribution-api.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ android {

defaultConfig {
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
multiDexEnabled true
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -44,6 +43,7 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
testOptions {
targetSdk project.targetSdkVersion
unitTests {
includeAndroidResources = true
}
Expand Down
2 changes: 1 addition & 1 deletion firebase-appdistribution/firebase-appdistribution.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ android {

defaultConfig {
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
multiDexEnabled true
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -46,6 +45,7 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
testOptions {
targetSdk project.targetSdkVersion
unitTests {
includeAndroidResources = true
}
Expand Down
2 changes: 1 addition & 1 deletion firebase-config/bandwagoner/bandwagoner.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ android {
defaultConfig {
applicationId "com.googletest.firebase.remoteconfig.bandwagoner"
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
targetSdk project.targetSdkVersion
versionCode 1
versionName "1.0"
multiDexEnabled true
Expand Down
7 changes: 5 additions & 2 deletions firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,14 @@ firebaseLibrary {
}

android {
adbOptions {
installation {
timeOutInMs 60 * 1000
}
namespace "com.google.firebase.crashlytics.ndk"
ndkVersion "27.2.12479018"
compileSdkVersion project.compileSdkVersion
defaultConfig {
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
versionName version

externalNativeBuild {
Expand All @@ -60,6 +59,10 @@ android {
}
}
}
testOptions {
targetSdk project.targetSdkVersion
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand Down
8 changes: 5 additions & 3 deletions firebase-crashlytics/firebase-crashlytics.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,17 @@ firebaseLibrary {
}

android {
adbOptions {
installation {
timeOutInMs 60 * 1000
}
namespace "com.google.firebase.crashlytics"
compileSdkVersion 37
testOptions.unitTests.includeAndroidResources = true
testOptions {
targetSdk project.targetSdkVersion
unitTests.includeAndroidResources = true
}
defaultConfig {
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
versionName version

multiDexEnabled true
Expand Down
8 changes: 5 additions & 3 deletions firebase-datatransport/firebase-datatransport.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,23 @@ android {
val targetSdkVersion: Int by rootProject
val minSdkVersion: Int by rootProject

adbOptions { timeOutInMs = 60000 }
installation { timeOutInMs = 60000 }

namespace = "com.google.firebase.datatransport"
compileSdk = compileSdkVersion
defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

testOptions { unitTests { isIncludeAndroidResources = true } }
testOptions {
targetSdk = targetSdkVersion
unitTests { isIncludeAndroidResources = true }
}
}

dependencies {
Expand Down
8 changes: 5 additions & 3 deletions firebase-firestore/firebase-firestore.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,13 @@ protobuf {
}

android {
adbOptions {
installation {
timeOutInMs 60 * 1000
}

namespace "com.google.firebase.firestore"
compileSdkVersion project.compileSdkVersion
defaultConfig {
targetSdkVersion project.targetSdkVersion
minSdkVersion project.minSdkVersion
versionName version
multiDexEnabled true
Expand Down Expand Up @@ -113,7 +112,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
testOptions.unitTests.includeAndroidResources = true
testOptions {
targetSdk project.targetSdkVersion
unitTests.includeAndroidResources = true
}

}

Expand Down
2 changes: 1 addition & 1 deletion firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ android {
compileSdkVersion project.compileSdkVersion
defaultConfig {
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
versionCode 1
versionName version
multiDexEnabled true
Expand Down Expand Up @@ -72,6 +71,7 @@ android {
}

testOptions {
targetSdk project.targetSdkVersion
unitTests {
includeAndroidResources true
}
Expand Down
Loading
Loading