Skip to content

Commit c763af9

Browse files
davidmotsondavidmotson
authored
Merge branch 'master' into davidmotson.imagen_editing
2 parents 433ce0a + 7f00c57 commit c763af9

160 files changed

Lines changed: 482 additions & 5032 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/android.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66

77
concurrency:
8-
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
8+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
99
cancel-in-progress: true
1010

1111
jobs:
@@ -33,4 +33,4 @@ jobs:
3333
if: github.event_name == 'pull_request'
3434
- name: Build with Gradle (Push)
3535
run: ./gradlew clean ktlint assemble
36-
if: github.event_name != 'pull_request'
36+
if: github.event_name != 'pull_request'

‎README.md‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,17 @@ the sample you wish to run.
2020
- [Firebase AI Logic](firebase-ai/README.md)
2121
- [Analytics](analytics/README.md)
2222
- [App Distribution](appdistribution/README.md)
23-
- [App-Indexing](app-indexing/README.md)
2423
- [Auth](auth/README.md)
25-
- [Config](config/README.md)
26-
- [Crash](crash/README.md)
27-
- [Database](database/README.md)
24+
- [Remote Config](config/README.md)
25+
- [Crashlytics](crash/README.md)
26+
- [Realtime Database](database/README.md)
27+
- [Data Connect](dataconnect/README.md)
2828
- [Firestore](firestore/README.md)
29-
- [Functions](functions/README.md)
30-
- [Dynamic Links](dynamiclinks/README.md)
29+
- [Cloud Functions for Firebase](functions/README.md)
3130
- [In-App Messaging](inappmessaging/README.md)
32-
- [Messaging](messaging/README.md)
33-
- [ML Kit](mlkit/README.md)
34-
- [ML Kit LanguageID](mlkit-langid/README.md)
35-
- [ML Kit Smart Reply](mlkit-smartreply/README.md)
36-
- [ML Kit Translate](mlkit-translate/README.md)
31+
- [Cloud Messaging](messaging/README.md)
3732
- [Performance Monitoring](perf/README.md)
38-
- [Storage](storage/README.md)
33+
- [Cloud Storage for Firebase](storage/README.md)
3934

4035
## How to make contributions?
4136
Please read and follow the steps in the [CONTRIBUTING.md](CONTRIBUTING.md)
@@ -44,6 +39,6 @@ Please read and follow the steps in the [CONTRIBUTING.md](CONTRIBUTING.md)
4439
[![SAM Score][sam-score-badge]][sam-score]
4540

4641
[gh-actions]: https://github.com/firebase/quickstart-android/actions
47-
[gh-actions-badge]: https://github.com/firebase/quickstart-android/workflows/Android%20CI/badge.svg
42+
[gh-actions-badge]: https://github.com/firebase/quickstart-android/actions/workflows/android.yml/badge.svg?branch=master&event=push
4843
[sam-score]: https://ossbot.computer/samscore.html
4944
[sam-score-badge]: https://ossbot.computer/samscorebadge?org=firebase&repo=quickstart-android

‎admob/app/build.gradle.kts‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.android.build.gradle.internal.tasks.factory.dependsOn
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
id("com.android.application")
@@ -16,7 +17,7 @@ android {
1617

1718
defaultConfig {
1819
applicationId = "com.google.samples.quickstart.admobexample"
19-
minSdk = 21
20+
minSdk = 23
2021
targetSdk = 36
2122
versionCode = 1
2223
versionName = "1.0"
@@ -38,8 +39,10 @@ android {
3839
sourceCompatibility = JavaVersion.VERSION_17
3940
targetCompatibility = JavaVersion.VERSION_17
4041
}
41-
kotlinOptions {
42-
jvmTarget = "17"
42+
kotlin {
43+
compilerOptions {
44+
jvmTarget = JvmTarget.JVM_17
45+
}
4346
}
4447
buildFeatures {
4548
viewBinding = true
@@ -52,21 +55,21 @@ dependencies {
5255
implementation("androidx.appcompat:appcompat:1.7.1")
5356
implementation("com.google.android.material:material:1.12.0")
5457
implementation("androidx.browser:browser:1.5.0")
55-
implementation("androidx.navigation:navigation-fragment-ktx:2.9.0")
56-
implementation("androidx.navigation:navigation-ui-ktx:2.9.0")
58+
implementation("androidx.navigation:navigation-fragment-ktx:2.9.3")
59+
implementation("androidx.navigation:navigation-ui-ktx:2.9.3")
5760

5861
implementation("com.google.android.gms:play-services-ads:23.3.0")
5962

6063
// Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
61-
implementation(platform("com.google.firebase:firebase-bom:33.15.0"))
64+
implementation(platform("com.google.firebase:firebase-bom:34.1.0"))
6265

6366
// For an optimal experience using AdMob, add the Firebase SDK
6467
// for Google Analytics. This is recommended, but not required.
6568
implementation("com.google.firebase:firebase-analytics")
6669

67-
debugImplementation("androidx.fragment:fragment-testing:1.8.8")
68-
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
69-
androidTestImplementation("androidx.test:rules:1.6.1")
70-
androidTestImplementation("androidx.test:runner:1.6.2")
71-
androidTestImplementation("androidx.test.ext:junit:1.2.1")
70+
debugImplementation("androidx.fragment:fragment-testing:1.8.9")
71+
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
72+
androidTestImplementation("androidx.test:rules:1.7.0")
73+
androidTestImplementation("androidx.test:runner:1.7.0")
74+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
7275
}

‎admob/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
plugins {
4-
id("com.android.application") version "8.10.1" apply false
5-
id("com.android.library") version "8.10.1" apply false
4+
id("com.android.application") version "8.12.0" apply false
5+
id("com.android.library") version "8.12.0" apply false
66
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
7-
id("com.google.gms.google-services") version "4.4.2" apply false
7+
id("com.google.gms.google-services") version "4.4.3" apply false
88
}
99

1010
allprojects {

‎admob/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎analytics/app/build.gradle.kts‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import com.android.build.gradle.internal.tasks.factory.dependsOn
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23

34
plugins {
45
id("com.android.application")
@@ -16,7 +17,7 @@ android {
1617

1718
defaultConfig {
1819
applicationId = "com.google.firebase.quickstart.analytics"
19-
minSdk = 21
20+
minSdk = 23
2021
targetSdk = 36
2122
versionCode = 1
2223
versionName = "1.0"
@@ -36,8 +37,10 @@ android {
3637
targetCompatibility = JavaVersion.VERSION_17
3738
}
3839

39-
kotlinOptions {
40-
jvmTarget = "17"
40+
kotlin {
41+
compilerOptions {
42+
jvmTarget = JvmTarget.JVM_17
43+
}
4144
}
4245

4346
buildFeatures {
@@ -53,16 +56,16 @@ dependencies {
5356
implementation("androidx.appcompat:appcompat:1.7.1")
5457
implementation("androidx.preference:preference-ktx:1.2.1")
5558
// Needed to override the version used by preference-ktx
56-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1")
59+
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.2")
5760

5861
// Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
59-
implementation(platform("com.google.firebase:firebase-bom:33.15.0"))
62+
implementation(platform("com.google.firebase:firebase-bom:34.1.0"))
6063

6164
// Firebase Analytics
6265
implementation("com.google.firebase:firebase-analytics")
6366

64-
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
65-
androidTestImplementation("androidx.test:rules:1.6.1")
66-
androidTestImplementation("androidx.test:runner:1.6.2")
67-
androidTestImplementation("androidx.test.ext:junit:1.2.1")
67+
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
68+
androidTestImplementation("androidx.test:rules:1.7.0")
69+
androidTestImplementation("androidx.test:runner:1.7.0")
70+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
6871
}

‎analytics/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
plugins {
4-
id("com.android.application") version "8.10.1" apply false
5-
id("com.android.library") version "8.10.1" apply false
4+
id("com.android.application") version "8.12.0" apply false
5+
id("com.android.library") version "8.12.0" apply false
66
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
7-
id("com.google.gms.google-services") version "4.4.2" apply false
7+
id("com.google.gms.google-services") version "4.4.3" apply false
88
}
99

1010
allprojects {

‎analytics/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎app-indexing/.gitignore‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎app-indexing/.google/packaging.yaml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)