From 5df4efc1fd0d9339d1462aa6981a5f8d1a935f35 Mon Sep 17 00:00:00 2001 From: Ben Weiss Date: Tue, 10 Dec 2024 16:09:25 +0100 Subject: [PATCH] Address review comments Change-Id: Ia2c6a52e289285a7a78336fa4250fa6a04ccb5c4 --- app/prodRelease-badging.txt | 4 ++-- .../kotlin/AndroidApplicationFirebaseConventionPlugin.kt | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/prodRelease-badging.txt b/app/prodRelease-badging.txt index 0d770604e..9908e775a 100644 --- a/app/prodRelease-badging.txt +++ b/app/prodRelease-badging.txt @@ -1,6 +1,6 @@ -package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15' +package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14' sdkVersion:'21' -targetSdkVersion:'35' +targetSdkVersion:'34' uses-permission: name='android.permission.INTERNET' uses-permission: name='android.permission.ACCESS_NETWORK_STATE' uses-permission: name='android.permission.POST_NOTIFICATIONS' diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt index b0228fe93..a5e001bd2 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt @@ -37,6 +37,12 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin { add("implementation", platform(bom)) "implementation"(libs.findLibrary("firebase.analytics").get()) "implementation"(libs.findLibrary("firebase.performance").get()) { + /* + Exclusion of protobuf / protolite dependencies is necessary as the + datastore-proto brings in protobuf dependencies. These are the source of truth + for Now in Android. + That's why the duplicate classes from below dependencies are excluded. + */ exclude(group = "com.google.protobuf", module = "protobuf-javalite") exclude(group = "com.google.firebase", module = "protolite-well-known-types") }