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
4 changes: 2 additions & 2 deletions admob/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ dependencies {

// For an optimal experience using AdMob, add the Firebase SDK
// for Google Analytics. This is recommended, but not required.
implementation 'com.google.firebase:firebase-analytics:17.4.4'
implementation 'com.google.firebase:firebase-analytics:17.5.0'

androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"
}

apply plugin: 'com.google.gms.google-services'
2 changes: 1 addition & 1 deletion admob/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
6 changes: 3 additions & 3 deletions analytics/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ android {
dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooserx")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"

implementation 'com.google.android.material:material:1.2.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation "androidx.preference:preference-ktx:1.1.1"

// Firebase Analytics (Java)
implementation 'com.google.firebase:firebase-analytics:17.4.4'
implementation 'com.google.firebase:firebase-analytics:17.5.0'

// Firebase Analytics (Kotlin)
implementation 'com.google.firebase:firebase-analytics-ktx:17.4.4'
implementation 'com.google.firebase:firebase-analytics-ktx:17.5.0'

androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
Expand Down
2 changes: 1 addition & 1 deletion analytics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion app-indexing/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ android {
dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooserx")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"
// [START app_indexing_gradle_dep]
implementation 'com.google.firebase:firebase-appindexing:19.1.0'
// [END app_indexing_gradle_dep]
Expand Down
2 changes: 1 addition & 1 deletion app-indexing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
6 changes: 3 additions & 3 deletions auth/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ dependencies {
implementation project(':internal:lintchecks')
implementation 'androidx.multidex:multidex:2.0.1'

implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0'
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
implementation 'com.google.android.material:material:1.2.0'

// Firebase Authentication (Java)
implementation 'com.google.firebase:firebase-analytics:17.4.4'
implementation 'com.google.firebase:firebase-analytics:17.5.0'
implementation 'com.google.firebase:firebase-auth:19.3.2'

// Firebase Authentication (Kotlin)
Expand All @@ -64,7 +64,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
androidTestImplementation 'androidx.test:runner:1.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"
}

apply plugin: 'com.google.gms.google-services'
2 changes: 1 addition & 1 deletion auth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'

classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:perf-plugin:1.3.1'
Expand Down
4 changes: 2 additions & 2 deletions config/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android {
dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooserx")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"

implementation 'com.google.android.material:material:1.2.0'

Expand All @@ -42,7 +42,7 @@ dependencies {

// For an optimal experience using Remote Config, add the Firebase SDK
// for Google Analytics. This is recommended, but not required.
implementation 'com.google.firebase:firebase-analytics:17.4.4'
implementation 'com.google.firebase:firebase-analytics:17.5.0'

androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
Expand Down
2 changes: 1 addition & 1 deletion config/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
3 changes: 0 additions & 3 deletions copy_mock_google_services_json.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,4 @@ cp mock-google-services.json inappmessaging/app/google-services.json
cp mock-google-services.json perf/app/google-services.json
cp mock-google-services.json messaging/app/google-services.json
cp mock-google-services.json mlkit/app/google-services.json
cp mock-google-services.json mlkit-langid/app/google-services.json
cp mock-google-services.json mlkit-smartreply/app/google-services.json
cp mock-google-services.json mlkit-translate/app/google-services.json
cp mock-google-services.json storage/app/google-services.json
8 changes: 4 additions & 4 deletions crash/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@ dependencies {
implementation 'com.google.android.material:material:1.2.0'

// Crashlytics (Java)
implementation 'com.google.firebase:firebase-crashlytics:17.1.1'
implementation 'com.google.firebase:firebase-crashlytics:17.2.1'

// Crashlytics (Kotlin)
implementation 'com.google.firebase:firebase-crashlytics-ktx:17.1.1'
implementation 'com.google.firebase:firebase-crashlytics-ktx:17.2.1'

// For an optimal experience using Crashlytics, add the Firebase SDK
// for Google Analytics. This is recommended, but not required.
implementation 'com.google.firebase:firebase-analytics:17.4.4'
implementation 'com.google.firebase:firebase-analytics:17.5.0'

testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"
}

apply plugin: 'com.google.gms.google-services'
2 changes: 1 addition & 1 deletion crash/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion database/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ androidExtensions {
dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooserx")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
Expand Down
2 changes: 1 addition & 1 deletion database/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
4 changes: 2 additions & 2 deletions dynamiclinks/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ android {
dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooserx")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"

implementation 'com.google.android.material:material:1.2.0'

Expand All @@ -56,7 +56,7 @@ dependencies {

// For an optimal experience using Dynamic Links, add the Firebase SDK
// for Google Analytics. This is recommended, but not required.
implementation 'com.google.firebase:firebase-analytics:17.4.4'
implementation 'com.google.firebase:firebase-analytics:17.5.0'

androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
Expand Down
2 changes: 1 addition & 1 deletion dynamiclinks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion firestore/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ androidExtensions {
dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooserx")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"

// Firestore (Java)
implementation 'com.google.firebase:firebase-firestore:21.5.0'
Expand Down
2 changes: 1 addition & 1 deletion firestore/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion functions/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ android {
dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooserx")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.2.0'
Expand Down
2 changes: 1 addition & 1 deletion functions/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
8 changes: 4 additions & 4 deletions inappmessaging/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ android {
dependencies {
implementation project(":internal:lintchecks")
implementation project(":internal:chooserx")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"

implementation 'com.google.android.material:material:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0'
implementation 'androidx.multidex:multidex:2.0.1'

// FIAM (Java)
Expand All @@ -48,10 +48,10 @@ dependencies {

// The Firebase SDK for Google Analytics is required to use In-App Messaging
// Analytics (Java)
implementation 'com.google.firebase:firebase-analytics:17.4.4'
implementation 'com.google.firebase:firebase-analytics:17.5.0'

// Analytics (Kotlin)
implementation 'com.google.firebase:firebase-analytics-ktx:17.4.4'
implementation 'com.google.firebase:firebase-analytics-ktx:17.5.0'

implementation 'com.google.firebase:firebase-iid:20.2.4'

Expand Down
2 changes: 1 addition & 1 deletion inappmessaging/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
dependencies {
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion internal/chooserx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ android {
dependencies {
api 'com.google.android.material:material:1.2.0'
api 'androidx.recyclerview:recyclerview:1.1.0'
api 'androidx.constraintlayout:constraintlayout:1.1.3'
api 'androidx.constraintlayout:constraintlayout:2.0.0'
}
2 changes: 1 addition & 1 deletion internal/lint/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sourceCompatibility = JavaVersion.VERSION_1_7

dependencies {
compileOnly "com.android.tools.lint:lint-api:27.0.1"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"
testImplementation "com.android.tools.lint:lint:27.0.1"
testImplementation "com.android.tools.lint:lint-tests:27.0.1"
}
Expand Down
4 changes: 2 additions & 2 deletions messaging/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {

// For an optimal experience using FCM, add the Firebase SDK
// for Google Analytics. This is recommended, but not required.
implementation 'com.google.firebase:firebase-analytics:17.4.4'
implementation 'com.google.firebase:firebase-analytics:17.5.0'

implementation 'android.arch.work:work-runtime:1.0.1'

Expand All @@ -58,7 +58,7 @@ dependencies {
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
androidTestImplementation 'androidx.annotation:annotation:1.1.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0"
}

apply plugin: 'com.google.gms.google-services'
2 changes: 1 addition & 1 deletion messaging/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0'
}
}

Expand Down
13 changes: 0 additions & 13 deletions mlkit-langid/.gitignore

This file was deleted.

Loading