Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Merge branch 'main' into firebase-ktx

Simon Marquis2a43c3f72540
diff --cc app/prodRelease-badging.txt
index 468c31be3,769e0a6e4..e44d86c47
--- a/app/prodRelease-badging.txt
+++ b/app/prodRelease-badging.txt
@@@ -6,11 -6,9 +6,11 @@@ uses-permission: name='android.permissi
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.RECEIVE_BOOT_COMPLETED'
+ uses-permission: name='android.permission.FOREGROUND_SERVICE'
uses-permission: name='com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE'
+uses-permission: name='android.permission.ACCESS_ADSERVICES_ATTRIBUTION'
+uses-permission: name='android.permission.ACCESS_ADSERVICES_AD_ID'
- uses-permission: name='android.permission.RECEIVE_BOOT_COMPLETED'
- uses-permission: name='android.permission.FOREGROUND_SERVICE'
uses-permission: name='com.google.samples.apps.nowinandroid.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION'
application-label:'Now in Android'
application-label-af:'Now in Android'
@@@ -107,10 -105,9 +107,10 @@@ application-icon-640:'res/mipmap-anydpi
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:'android.ext.adservices'
uses-library-not-required:'androidx.window.extensions'
uses-library-not-required:'androidx.window.sidecar'
+ uses-library-not-required:'android.ext.adservices'
feature-group: label=''
uses-feature: name='android.hardware.faketouch'
uses-implied-feature: name='android.hardware.faketouch' reason='default feature for all apps'
diff --cc gradle/libs.versions.toml
index e7dcef1ec,c35d756da..ab082d48f
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@@ -24,19 -26,19 +26,19 @@@ androidxTestCore = "1.5.0
androidxTestExt = "1.1.5"
androidxTestRules = "1.5.0"
androidxTestRunner = "1.5.2"
- androidxTracing = "1.1.0"
- androidxUiAutomator = "2.2.0"
- androidxWindowManager = "1.2.0"
+ androidxTracing = "1.3.0-alpha02"
+ androidxUiAutomator = "2.3.0"
+ androidxWindowManager = "1.3.0-alpha03"
androidxWork = "2.9.0"
- coil = "2.5.0"
- dependencyGuard = "0.4.3"
- firebaseBom = "32.6.0"
+ coil = "2.6.0"
+ dependencyGuard = "0.5.0"
-firebaseBom = "32.4.0"
++firebaseBom = "33.1.1"
firebaseCrashlyticsPlugin = "2.9.9"
firebasePerfPlugin = "1.4.2"
- gmsPlugin = "4.4.0"
+ gmsPlugin = "4.4.1"
googleOss = "17.0.1"
googleOssPlugin = "0.10.6"
- hilt = "2.50"
+ hilt = "2.51.1"
hiltExt = "1.1.0"
jacoco = "0.8.7"
junit4 = "4.13.2"