From 9abc0cc2d4d8da6a7a3d0672b96b992100335ac5 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Tue, 31 Oct 2023 21:26:53 +0000 Subject: [PATCH 01/13] upgrade to Firebase BoM 32.5.0 and drop Firebase KTX --- .../apps/nowinandroid/core/analytics/AnalyticsModule.kt | 4 ++-- gradle/libs.versions.toml | 8 ++++---- .../samples/apps/nowinandroid/sync/di/SyncModule.kt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt b/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt index 9f875ae6d..a2a1d1fad 100644 --- a/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt +++ b/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt @@ -17,8 +17,8 @@ package com.google.samples.apps.nowinandroid.core.analytics import com.google.firebase.analytics.FirebaseAnalytics -import com.google.firebase.analytics.ktx.analytics -import com.google.firebase.ktx.Firebase +import com.google.firebase.analytics.analytics +import com.google.firebase.Firebase import dagger.Binds import dagger.Module import dagger.Provides diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60d827c0e..516c4b30d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,7 @@ androidxUiAutomator = "2.2.0" androidxWindowManager = "1.1.0" androidxWork = "2.9.0-beta01" coil = "2.4.0" -firebaseBom = "32.3.1" +firebaseBom = "32.5.0" firebaseCrashlyticsPlugin = "2.9.9" firebasePerfPlugin = "1.4.2" gmsPlugin = "4.4.0" @@ -103,9 +103,9 @@ coil-kt-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = " coil-kt-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" } firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" } firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" } -firebase-cloud-messaging = { group = "com.google.firebase", name = "firebase-messaging-ktx" } -firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" } -firebase-performance = { group = "com.google.firebase", name = "firebase-perf-ktx" } +firebase-cloud-messaging = { group = "com.google.firebase", name = "firebase-messaging" } +firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" } +firebase-performance = { group = "com.google.firebase", name = "firebase-perf" } firebase-performance-gradle = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" } google-oss-licenses = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "googleOss" } google-oss-licenses-plugin = { group = "com.google.android.gms", name = "oss-licenses-plugin", version.ref = "googleOssPlugin" } diff --git a/sync/work/src/prod/kotlin/com/google/samples/apps/nowinandroid/sync/di/SyncModule.kt b/sync/work/src/prod/kotlin/com/google/samples/apps/nowinandroid/sync/di/SyncModule.kt index af4508406..9a69a3c78 100644 --- a/sync/work/src/prod/kotlin/com/google/samples/apps/nowinandroid/sync/di/SyncModule.kt +++ b/sync/work/src/prod/kotlin/com/google/samples/apps/nowinandroid/sync/di/SyncModule.kt @@ -16,9 +16,9 @@ package com.google.samples.apps.nowinandroid.sync.di -import com.google.firebase.ktx.Firebase +import com.google.firebase.Firebase import com.google.firebase.messaging.FirebaseMessaging -import com.google.firebase.messaging.ktx.messaging +import com.google.firebase.messaging.messaging import com.google.samples.apps.nowinandroid.core.data.util.SyncManager import com.google.samples.apps.nowinandroid.sync.status.FirebaseSyncSubscriber import com.google.samples.apps.nowinandroid.sync.status.SyncSubscriber From 69ca3a935ef9cf22ba4d098d981ddce15971f9ce Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 2 Nov 2023 14:49:34 +0000 Subject: [PATCH 02/13] Push spotless changes back to fork, rather than base repo Change-Id: I45584350fe01bed54094780d3fc86b7d271d5709 --- .github/workflows/Build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index b8b8a3b9c..f60c8d548 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -39,6 +39,7 @@ jobs: - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Apply Spotless + repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Build all build type and flavor permutations run: ./gradlew assemble From 4d83426182b9470a123561ef9d23b482441743c0 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 2 Nov 2023 14:51:30 +0000 Subject: [PATCH 03/13] Add the ref Change-Id: I1fd3eb6ed0158a80511bc75d315d99d8650f5a6e --- .github/workflows/Build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index f60c8d548..598274378 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -40,6 +40,7 @@ jobs: with: commit_message: Apply Spotless repository: ${{ github.event.pull_request.head.repo.full_name }} + ref: ${{ github.head_ref }} - name: Build all build type and flavor permutations run: ./gradlew assemble From 38cb9f0a8e827aa3f710ea3e35bf981f5b54a32d Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 2 Nov 2023 15:34:10 +0000 Subject: [PATCH 04/13] Fix CI Change-Id: Ibddc1a0635a557e4432a77f2dbb032c519bf4b5a --- .github/workflows/Build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 598274378..0bd3e9e6f 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -40,7 +40,7 @@ jobs: with: commit_message: Apply Spotless repository: ${{ github.event.pull_request.head.repo.full_name }} - ref: ${{ github.head_ref }} + branch: ${{ github.head_ref }} - name: Build all build type and flavor permutations run: ./gradlew assemble From 6a8d5452bb2ed5b3499de67e6068326a05d0bf68 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 2 Nov 2023 15:45:06 +0000 Subject: [PATCH 05/13] Remove CI changes, will fix in separate PR Change-Id: I59b0f94760e99fd29ed61a29c56e2cead48b3e19 --- .github/workflows/Build.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 0bd3e9e6f..c826c893a 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -39,9 +39,7 @@ jobs: - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Apply Spotless - repository: ${{ github.event.pull_request.head.repo.full_name }} - branch: ${{ github.head_ref }} - + - name: Build all build type and flavor permutations run: ./gradlew assemble From bbcabea2206eadfbc240d4a718780288b17fa9f3 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 2 Nov 2023 15:46:06 +0000 Subject: [PATCH 06/13] Fix formatting issues Change-Id: Ia90a4aad72db737455b70de9b4583689d6a0e5d6 --- .../samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt b/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt index a2a1d1fad..45ff65a71 100644 --- a/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt +++ b/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt @@ -16,9 +16,9 @@ package com.google.samples.apps.nowinandroid.core.analytics +import com.google.firebase.Firebase import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.analytics.analytics -import com.google.firebase.Firebase import dagger.Binds import dagger.Module import dagger.Provides From 368e8b7348d82f9addfa80fc5e3b0049b15ab22c Mon Sep 17 00:00:00 2001 From: Don Turner Date: Thu, 2 Nov 2023 19:04:22 +0000 Subject: [PATCH 07/13] Add updated badging for prodRelease variant Change-Id: Ibe71c285708ffec85520a0c7852600f361ed1646 --- app/prodRelease-badging.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/prodRelease-badging.txt b/app/prodRelease-badging.txt index 6c3a859c7..3fb740202 100644 --- a/app/prodRelease-badging.txt +++ b/app/prodRelease-badging.txt @@ -6,6 +6,8 @@ uses-permission: name='android.permission.ACCESS_NETWORK_STATE' uses-permission: name='android.permission.POST_NOTIFICATIONS' uses-permission: name='android.permission.WAKE_LOCK' uses-permission: name='com.google.android.c2dm.permission.RECEIVE' +uses-permission: name='android.permission.ACCESS_ADSERVICES_ATTRIBUTION' +uses-permission: name='android.permission.ACCESS_ADSERVICES_AD_ID' uses-permission: name='com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE' uses-permission: name='android.permission.RECEIVE_BOOT_COMPLETED' uses-permission: name='android.permission.FOREGROUND_SERVICE' @@ -107,6 +109,7 @@ application: label='Now in Android' icon='res/mipmap-anydpi-v26/ic_launcher.xml' launchable-activity: name='com.google.samples.apps.nowinandroid.MainActivity' label='' icon='' uses-library-not-required:'androidx.window.extensions' uses-library-not-required:'androidx.window.sidecar' +property: name='android.adservices.AD_SERVICES_CONFIG' resource='res/xml/ga_ad_services_config.xml' uses-library-not-required:'android.ext.adservices' feature-group: label='' uses-feature: name='android.hardware.faketouch' From 137a5de28c78c0cde07d21d2aee2d3cb9996785f Mon Sep 17 00:00:00 2001 From: rosariopf Date: Fri, 3 Nov 2023 14:38:46 +0000 Subject: [PATCH 08/13] remove ktx import from FirebaseAnalyticsHelper.kt --- .../apps/nowinandroid/core/analytics/FirebaseAnalyticsHelper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/FirebaseAnalyticsHelper.kt b/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/FirebaseAnalyticsHelper.kt index 75dfbc468..62d4d9bcb 100644 --- a/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/FirebaseAnalyticsHelper.kt +++ b/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/FirebaseAnalyticsHelper.kt @@ -17,7 +17,7 @@ package com.google.samples.apps.nowinandroid.core.analytics import com.google.firebase.analytics.FirebaseAnalytics -import com.google.firebase.analytics.ktx.logEvent +import com.google.firebase.analytics.logEvent import javax.inject.Inject /** From 0081d1410572995ef4252cb6fe9874727be9ca79 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Fri, 3 Nov 2023 14:47:16 +0000 Subject: [PATCH 09/13] remove ACCESS_ADSERVICES permissions --- app/prodRelease-badging.txt | 2 -- app/src/main/AndroidManifest.xml | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/prodRelease-badging.txt b/app/prodRelease-badging.txt index 3fb740202..e02e43563 100644 --- a/app/prodRelease-badging.txt +++ b/app/prodRelease-badging.txt @@ -6,8 +6,6 @@ uses-permission: name='android.permission.ACCESS_NETWORK_STATE' uses-permission: name='android.permission.POST_NOTIFICATIONS' uses-permission: name='android.permission.WAKE_LOCK' uses-permission: name='com.google.android.c2dm.permission.RECEIVE' -uses-permission: name='android.permission.ACCESS_ADSERVICES_ATTRIBUTION' -uses-permission: name='android.permission.ACCESS_ADSERVICES_AD_ID' uses-permission: name='com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE' uses-permission: name='android.permission.RECEIVE_BOOT_COMPLETED' uses-permission: name='android.permission.FOREGROUND_SERVICE' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0b0482c13..7bd013b1e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,11 +20,13 @@ + + Date: Fri, 5 Jul 2024 09:51:34 +0100 Subject: [PATCH 10/13] Update app/src/main/AndroidManifest.xml --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7bd013b1e..57b6b804f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,7 +20,7 @@ From c04ffa86731bb5af4380d1283d3a26c6f0f8ad4a Mon Sep 17 00:00:00 2001 From: Don Turner Date: Fri, 5 Jul 2024 09:52:30 +0100 Subject: [PATCH 11/13] Apply suggestions from code review --- app/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 57b6b804f..1f5e13f2f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,8 +21,8 @@ From a12731e6e2f35c64cbe85ef46e63b799892ceb70 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Fri, 5 Jul 2024 10:13:50 +0100 Subject: [PATCH 12/13] Add android.adservices.AD_SERVICES_CONFIG to badges Change-Id: I2c63da1aa2ef0bfadb7fa88a2502dbc3551e7527 --- app/prodRelease-badging.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/prodRelease-badging.txt b/app/prodRelease-badging.txt index 4cd4bceab..1e7f8db61 100644 --- a/app/prodRelease-badging.txt +++ b/app/prodRelease-badging.txt @@ -105,9 +105,9 @@ application-icon-640:'res/mipmap-anydpi-v26/ic_launcher.xml' application-icon-65534:'res/mipmap-anydpi-v26/ic_launcher.xml' application: label='Now in Android' icon='res/mipmap-anydpi-v26/ic_launcher.xml' launchable-activity: name='com.google.samples.apps.nowinandroid.MainActivity' label='' icon='' +property: name='android.adservices.AD_SERVICES_CONFIG' resource='res/xml/ga_ad_services_config.xml' uses-library-not-required:'androidx.window.extensions' uses-library-not-required:'androidx.window.sidecar' -property: name='android.adservices.AD_SERVICES_CONFIG' resource='res/xml/ga_ad_services_config.xml' uses-library-not-required:'android.ext.adservices' feature-group: label='' uses-feature: name='android.hardware.faketouch' From 6148d906562d4d6e196e6de84169f6e6be6005f8 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Fri, 5 Jul 2024 10:30:56 +0100 Subject: [PATCH 13/13] Update dependency guard Change-Id: I7be80c44205f7e4afcdd9e52eef42b5e9c6155e7 --- .../prodReleaseRuntimeClasspath.txt | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txt index d3e90da35..15a4bf21f 100644 --- a/app/dependencies/prodReleaseRuntimeClasspath.txt +++ b/app/dependencies/prodReleaseRuntimeClasspath.txt @@ -147,12 +147,12 @@ com.google.android.gms:play-services-ads-identifier:18.0.0 com.google.android.gms:play-services-base:18.0.1 com.google.android.gms:play-services-basement:18.1.0 com.google.android.gms:play-services-cloud-messaging:17.0.1 -com.google.android.gms:play-services-measurement-api:21.4.0 -com.google.android.gms:play-services-measurement-base:21.4.0 -com.google.android.gms:play-services-measurement-impl:21.4.0 -com.google.android.gms:play-services-measurement-sdk-api:21.4.0 -com.google.android.gms:play-services-measurement-sdk:21.4.0 -com.google.android.gms:play-services-measurement:21.4.0 +com.google.android.gms:play-services-measurement-api:21.5.0 +com.google.android.gms:play-services-measurement-base:21.5.0 +com.google.android.gms:play-services-measurement-impl:21.5.0 +com.google.android.gms:play-services-measurement-sdk-api:21.5.0 +com.google.android.gms:play-services-measurement-sdk:21.5.0 +com.google.android.gms:play-services-measurement:21.5.0 com.google.android.gms:play-services-oss-licenses:17.0.1 com.google.android.gms:play-services-stats:17.0.2 com.google.android.gms:play-services-tasks:18.0.2 @@ -163,16 +163,15 @@ com.google.dagger:hilt-android:2.51.1 com.google.dagger:hilt-core:2.51.1 com.google.errorprone:error_prone_annotations:2.11.0 com.google.firebase:firebase-abt:21.1.1 -com.google.firebase:firebase-analytics-ktx:21.4.0 -com.google.firebase:firebase-analytics:21.4.0 +com.google.firebase:firebase-analytics-ktx:21.5.0 +com.google.firebase:firebase-analytics:21.5.0 com.google.firebase:firebase-annotations:16.2.0 -com.google.firebase:firebase-bom:32.4.0 +com.google.firebase:firebase-bom:32.5.0 com.google.firebase:firebase-common-ktx:20.4.2 com.google.firebase:firebase-common:20.4.2 com.google.firebase:firebase-components:17.1.5 com.google.firebase:firebase-config:21.5.0 -com.google.firebase:firebase-crashlytics-ktx:18.5.0 -com.google.firebase:firebase-crashlytics:18.5.0 +com.google.firebase:firebase-crashlytics:18.5.1 com.google.firebase:firebase-datatransport:18.1.8 com.google.firebase:firebase-encoders-json:18.0.1 com.google.firebase:firebase-encoders-proto:16.0.0 @@ -181,9 +180,7 @@ com.google.firebase:firebase-iid-interop:17.1.0 com.google.firebase:firebase-installations-interop:17.1.1 com.google.firebase:firebase-installations:17.2.0 com.google.firebase:firebase-measurement-connector:19.0.0 -com.google.firebase:firebase-messaging-ktx:23.3.0 -com.google.firebase:firebase-messaging:23.3.0 -com.google.firebase:firebase-perf-ktx:20.5.0 +com.google.firebase:firebase-messaging:23.3.1 com.google.firebase:firebase-perf:20.5.0 com.google.firebase:firebase-sessions:1.1.0 com.google.firebase:protolite-well-known-types:18.0.0