Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,14 @@ android {
dependencies {
api firebaseCoreProject
implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}")
implementation 'com.google.firebase:firebase-firestore'
// Firestore 27 publishes test libraries as runtime dependencies. Mockito
// pulls byte-buddy 1.17.7, which Jetifier cannot transform.
implementation('com.google.firebase:firebase-firestore') {
exclude group: 'org.mockito', module: 'mockito-core'
exclude group: 'junit', module: 'junit'
exclude group: 'com.google.truth', module: 'truth'
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ android {
applicationId = "io.flutter.plugins.firebase.firestore.example"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion = flutter.minSdkVersion
minSdkVersion = Math.max(flutter.minSdkVersion, 24)
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ android {
applicationId = "com.example.pipeline_example"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
minSdk = maxOf(flutter.minSdkVersion, 24)
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ android {
applicationId = "io.flutter.plugins.firebase.functions.example"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion = flutter.minSdkVersion
minSdkVersion = Math.max(flutter.minSdkVersion, 24)
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
minSdk = maxOf(flutter.minSdkVersion, 24)
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23
minSdk = 24
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion = flutter.minSdkVersion
minSdkVersion = Math.max(flutter.minSdkVersion, 24)
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23
minSdk = 24
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion = flutter.minSdkVersion
minSdkVersion = Math.max(flutter.minSdkVersion, 24)
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ android {
applicationId = "io.flutter.plugins.firebasecoreexample"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23
minSdk = 24
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23
minSdk = 24
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ android {
applicationId = "io.flutter.plugins.firebase.dataconnect.example"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23
minSdk = 24
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.6.0'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.6.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ android {
applicationId = "io.flutter.plugins.firebase.database.example"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion flutter.minSdkVersion
minSdkVersion Math.max(flutter.minSdkVersion, 24)
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion = flutter.minSdkVersion
minSdkVersion = Math.max(flutter.minSdkVersion, 24)
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23
minSdk = 24
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ android {
dependencies {
api firebaseCoreProject
implementation platform("com.google.firebase:firebase-bom:${getRootProjectExtOrCoreProperty("FirebaseSDKVersion", firebaseCoreProject)}")
implementation 'com.google.firebase:firebase-ml-modeldownloader'
// BoM 35 dropped this artifact. 26.1.1 is the last version BoM 34.19.0 mapped.
implementation 'com.google.firebase:firebase-ml-modeldownloader:26.1.1'
implementation 'androidx.annotation:annotation:1.7.0'
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23
minSdk = 24
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23
minSdk = 24
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
applicationId = "io.flutter.plugins.firebase.tests"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = 23
minSdk = 24
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ android {
applicationId = "io.flutter.plugins.firebasestorageexample"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion = flutter.minSdkVersion
minSdkVersion = Math.max(flutter.minSdkVersion, 24)
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
2 changes: 1 addition & 1 deletion scripts/global-config.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ext {
compileSdk=34
minSdk=23
minSdk=24
targetSdk=34
javaVersion = JavaVersion.toVersion(17)
androidGradlePluginVersion = '8.3.0'
Expand Down
4 changes: 2 additions & 2 deletions tests/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ android {

defaultConfig {
applicationId = "io.flutter.plugins.firebase.tests"
// auth requires minSdk 23
minSdkVersion flutter.minSdkVersion
// Firebase Android BoM 35 requires API 24.
minSdkVersion Math.max(flutter.minSdkVersion, 24)
targetSdk = 35
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
Expand Down
Loading