diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 20f98a2f3..9a409ed8e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -251,11 +251,11 @@ dependencies { implementation(libs.accompanist.systemuicontroller) googleplayImplementation(platform(libs.firebase)) - googleplayImplementation("com.google.firebase:firebase-crashlytics") - googleplayImplementation("com.google.firebase:firebase-analytics") { + googleplayImplementation(libs.firebase.crashlytics) + googleplayImplementation(libs.firebase.analytics) { exclude("com.google.android.gms", "play-services-ads-identifier") } - googleplayImplementation("com.google.firebase:firebase-config-ktx") + googleplayImplementation(libs.firebase.config.ktx) googleplayImplementation(libs.play.services.location) googleplayImplementation(libs.play.services.maps) googleplayImplementation(libs.play.billing.ktx) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 19d8b4965..61e0ee3b1 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -220,17 +220,17 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6 (c) +| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6 (c) +| \--- androidx.lifecycle:lifecycle-common-java8:2.8.6 (c) -++--- com.google.firebase:firebase-bom:33.1.2 -+| +--- com.google.firebase:firebase-analytics:22.0.2 (c) -+| +--- com.google.firebase:firebase-config-ktx:22.0.0 (c) -+| +--- com.google.firebase:firebase-crashlytics:19.0.3 (c) -+| +--- com.google.firebase:firebase-config:22.0.0 (c) +++--- com.google.firebase:firebase-bom:33.5.1 ++| +--- com.google.firebase:firebase-analytics:22.1.2 (c) ++| +--- com.google.firebase:firebase-config-ktx:22.0.1 (c) ++| +--- com.google.firebase:firebase-crashlytics:19.2.1 (c) ++| +--- com.google.firebase:firebase-config:22.0.1 (c) +| +--- com.google.firebase:firebase-common:21.0.0 (c) +| +--- com.google.firebase:firebase-common-ktx:21.0.0 (c) +| +--- com.google.firebase:firebase-installations:18.0.0 (c) +| \--- com.google.firebase:firebase-encoders:17.0.0 (c) -++--- com.google.firebase:firebase-crashlytics -> 19.0.3 -+| +--- com.google.firebase:firebase-sessions:2.0.3 +++--- com.google.firebase:firebase-crashlytics -> 19.2.1 ++| +--- com.google.firebase:firebase-sessions:2.0.6 +| | +--- com.google.firebase:firebase-common:21.0.0 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4 -> 1.8.1 +| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*) @@ -450,8 +450,8 @@ +| +--- com.google.android.datatransport:transport-backend-cct:3.3.0 (*) +| +--- com.google.android.datatransport:transport-runtime:3.3.0 (*) +| \--- androidx.annotation:annotation:1.5.0 -> 1.8.1 (*) -++--- com.google.firebase:firebase-analytics -> 22.0.2 -+| +--- com.google.android.gms:play-services-measurement:22.0.2 +++--- com.google.firebase:firebase-analytics -> 22.1.2 ++| +--- com.google.android.gms:play-services-measurement:22.1.2 +| | +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) +| | +--- androidx.legacy:legacy-support-core-utils:1.0.0 +| | | +--- androidx.annotation:annotation:1.0.0 -> 1.8.1 (*) @@ -464,9 +464,9 @@ +| | | \--- androidx.print:print:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.8.1 (*) +| | +--- com.google.android.gms:play-services-basement:18.4.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:22.0.2 ++| | +--- com.google.android.gms:play-services-measurement-base:22.1.2 +| | | \--- com.google.android.gms:play-services-basement:18.4.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-impl:22.0.2 ++| | +--- com.google.android.gms:play-services-measurement-impl:22.1.2 +| | | +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) +| | | +--- androidx.core:core:1.9.0 -> 1.13.1 (*) +| | | +--- androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 @@ -487,19 +487,26 @@ +| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 2.0.21 (*) +| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.8.1 (*) +| | | | \--- androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 (c) ++| | | +--- com.google.android.gms:play-services-base:18.5.0 ++| | | | +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) ++| | | | +--- androidx.core:core:1.2.0 -> 1.13.1 (*) ++| | | | +--- androidx.fragment:fragment:1.0.0 -> 1.8.3 (*) ++| | | | +--- com.google.android.gms:play-services-basement:18.4.0 (*) ++| | | | \--- com.google.android.gms:play-services-tasks:18.2.0 (*) +| | | +--- com.google.android.gms:play-services-basement:18.4.0 (*) -+| | | +--- com.google.android.gms:play-services-measurement-base:22.0.2 (*) ++| | | +--- com.google.android.gms:play-services-measurement-base:22.1.2 (*) +| | | +--- com.google.android.gms:play-services-stats:17.0.2 +| | | | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) +| | | | \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.4.0 (*) ++| | | +--- com.google.android.gms:play-services-tasks:18.2.0 (*) +| | | \--- com.google.guava:guava:31.1-android -> 33.2.1-android (*) +| | \--- com.google.android.gms:play-services-stats:17.0.2 (*) -+| +--- com.google.android.gms:play-services-measurement-api:22.0.2 ++| +--- com.google.android.gms:play-services-measurement-api:22.1.2 +| | +--- com.google.android.gms:play-services-basement:18.4.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:22.0.2 (*) -+| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.0.2 ++| | +--- com.google.android.gms:play-services-measurement-base:22.1.2 (*) ++| | +--- com.google.android.gms:play-services-measurement-sdk-api:22.1.2 +| | | +--- com.google.android.gms:play-services-basement:18.4.0 (*) -+| | | \--- com.google.android.gms:play-services-measurement-base:22.0.2 (*) ++| | | \--- com.google.android.gms:play-services-measurement-base:22.1.2 (*) +| | +--- com.google.android.gms:play-services-tasks:18.2.0 (*) +| | +--- com.google.firebase:firebase-common:21.0.0 (*) +| | +--- com.google.firebase:firebase-common-ktx:21.0.0 (*) @@ -509,13 +516,13 @@ +| | +--- com.google.firebase:firebase-measurement-connector:19.0.0 -> 20.0.1 (*) +| | +--- com.google.guava:guava:31.1-android -> 33.2.1-android (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 2.0.21 (*) -+| \--- com.google.android.gms:play-services-measurement-sdk:22.0.2 ++| \--- com.google.android.gms:play-services-measurement-sdk:22.1.2 +| +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) +| +--- com.google.android.gms:play-services-basement:18.4.0 (*) -+| +--- com.google.android.gms:play-services-measurement-base:22.0.2 (*) -+| \--- com.google.android.gms:play-services-measurement-impl:22.0.2 (*) -++--- com.google.firebase:firebase-config-ktx -> 22.0.0 -+| +--- com.google.firebase:firebase-config:22.0.0 ++| +--- com.google.android.gms:play-services-measurement-base:22.1.2 (*) ++| \--- com.google.android.gms:play-services-measurement-impl:22.1.2 (*) +++--- com.google.firebase:firebase-config-ktx -> 22.0.1 ++| +--- com.google.firebase:firebase-config:22.0.1 +| | +--- com.google.firebase:firebase-config-interop:16.0.1 (*) +| | +--- com.google.firebase:firebase-annotations:16.2.0 (*) +| | +--- com.google.firebase:firebase-installations-interop:17.1.0 -> 17.2.0 (*) @@ -538,12 +545,7 @@ +| +--- com.google.firebase:firebase-components:18.0.0 (*) +| \--- com.google.firebase:firebase-installations-interop:17.1.0 -> 17.2.0 (*) ++--- com.google.android.gms:play-services-location:21.3.0 -+| +--- com.google.android.gms:play-services-base:18.5.0 -+| | +--- androidx.collection:collection:1.0.0 -> 1.4.4 (*) -+| | +--- androidx.core:core:1.2.0 -> 1.13.1 (*) -+| | +--- androidx.fragment:fragment:1.0.0 -> 1.8.3 (*) -+| | +--- com.google.android.gms:play-services-basement:18.4.0 (*) -+| | \--- com.google.android.gms:play-services-tasks:18.2.0 (*) ++| +--- com.google.android.gms:play-services-base:18.5.0 (*) +| +--- com.google.android.gms:play-services-basement:18.4.0 (*) +| +--- com.google.android.gms:play-services-tasks:18.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.0 -> 2.0.21 (*) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3d5bd404d..c1e8a9a13 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ dashclock-api = "2.0.0" dav4jvm = "2.2.1" desugar_jdk_libs = "2.1.2" etebase = "2.3.2" -firebase = "33.1.2" +firebase = "33.5.1" firebase-crashlytics-gradle = "3.0.2" flipper = "0.262.0" fragment-ktx = "1.8.3" @@ -123,6 +123,9 @@ facebook-flipper = { module = "com.facebook.flipper:flipper", version.ref = "fli facebook-flipper-network = { module = "com.facebook.flipper:flipper-network-plugin", version.ref = "flipper" } facebook-soloader = { module = "com.facebook.soloader:soloader", version.ref = "soloader" } firebase = { module = "com.google.firebase:firebase-bom", version.ref = "firebase" } +firebase-config-ktx = { module = "com.google.firebase:firebase-config-ktx" } +firebase-analytics = { module = "com.google.firebase:firebase-analytics" } +firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" } firebase-crashlytics-gradle = { module = "com.google.firebase:firebase-crashlytics-gradle", version.ref = "firebase-crashlytics-gradle" } google-oauth2 = { module = "com.google.auth:google-auth-library-oauth2-http", version.ref = "google-oauth2" } google-api-drive = { module = "com.google.apis:google-api-services-drive", version.ref = "google-api-drive" } diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts index f71c4297f..33aea26ac 100644 --- a/wear/build.gradle.kts +++ b/wear/build.gradle.kts @@ -3,6 +3,8 @@ plugins { alias(libs.plugins.jetbrains.kotlin.android) alias(libs.plugins.jetbrains.compose) alias(libs.plugins.kotlin.compose.compiler) + id("com.google.gms.google-services") + id("com.google.firebase.crashlytics") } android { @@ -68,6 +70,11 @@ dependencies { implementation(libs.androidx.ui.graphics) implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material.icons.extended) + implementation(platform(libs.firebase)) + implementation(libs.firebase.crashlytics) + implementation(libs.firebase.analytics) { + exclude("com.google.android.gms", "play-services-ads-identifier") + } implementation(libs.wear.compose.material) implementation(libs.wear.compose.foundation) implementation(libs.wear.compose.navigation) diff --git a/wear/src/debug/google-services.json b/wear/src/debug/google-services.json new file mode 100644 index 000000000..9f2b97dfe --- /dev/null +++ b/wear/src/debug/google-services.json @@ -0,0 +1,40 @@ +{ + "project_info": { + "project_number": "448612483090", + "firebase_url": "https://tasks-debug.firebaseio.com", + "project_id": "tasks-debug", + "storage_bucket": "tasks-debug.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:448612483090:android:c31434c55745e54c", + "android_client_info": { + "package_name": "org.tasks" + } + }, + "oauth_client": [ + { + "client_id": "448612483090-ns27d5rn3nm5nh4fjrkc22ag9qslkuho.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBLqXwszuCxCXdYRz7FCgpJa9Kufo4cs8E" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "448612483090-ns27d5rn3nm5nh4fjrkc22ag9qslkuho.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml index c0ef65f44..36c0c3b83 100644 --- a/wear/src/main/AndroidManifest.xml +++ b/wear/src/main/AndroidManifest.xml @@ -20,6 +20,18 @@ android:name="com.google.android.wearable.standalone" android:value="false" /> + + + + + +