Takahirom/use theme material light no action bar/2024 12 10

app/dependencies/prodReleaseRuntimeClasspath.txt

@@ -59,10 +59,11 @@ androidx.compose.ui:ui-util-android:1.7.5
 androidx.compose.ui:ui-util:1.7.5
 androidx.compose.ui:ui:1.7.5
 androidx.compose:compose-bom:2024.11.00
+androidx.concurrent:concurrent-futures-ktx:1.1.0
 androidx.concurrent:concurrent-futures:1.1.0
-androidx.core:core-ktx:1.13.1
+androidx.core:core-ktx:1.15.0
 androidx.core:core-splashscreen:1.0.1
-androidx.core:core:1.13.1
+androidx.core:core:1.15.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
@@ -89,38 +90,38 @@ androidx.hilt:hilt-navigation:1.2.0
 androidx.hilt:hilt-work:1.2.0
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-utils:1.0.0
-androidx.lifecycle:lifecycle-common-java8:2.8.6
-androidx.lifecycle:lifecycle-common-jvm:2.8.6
-androidx.lifecycle:lifecycle-common:2.8.6
-androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.6
-androidx.lifecycle:lifecycle-livedata-core:2.8.6
-androidx.lifecycle:lifecycle-livedata:2.8.6
-androidx.lifecycle:lifecycle-process:2.8.6
-androidx.lifecycle:lifecycle-runtime-android:2.8.6
-androidx.lifecycle:lifecycle-runtime-compose-android:2.8.6
-androidx.lifecycle:lifecycle-runtime-compose:2.8.6
-androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.6
-androidx.lifecycle:lifecycle-runtime-ktx:2.8.6
-androidx.lifecycle:lifecycle-runtime:2.8.6
-androidx.lifecycle:lifecycle-service:2.8.6
-androidx.lifecycle:lifecycle-viewmodel-android:2.8.6
-androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.6
-androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.6
-androidx.lifecycle:lifecycle-viewmodel:2.8.6
+androidx.lifecycle:lifecycle-common-java8:2.8.7
+androidx.lifecycle:lifecycle-common-jvm:2.8.7
+androidx.lifecycle:lifecycle-common:2.8.7
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7
+androidx.lifecycle:lifecycle-livedata-core:2.8.7
+androidx.lifecycle:lifecycle-livedata:2.8.7
+androidx.lifecycle:lifecycle-process:2.8.7
+androidx.lifecycle:lifecycle-runtime-android:2.8.7
+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
+androidx.lifecycle:lifecycle-runtime-compose:2.8.7
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
+androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
+androidx.lifecycle:lifecycle-runtime:2.8.7
+androidx.lifecycle:lifecycle-service:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
+androidx.lifecycle:lifecycle-viewmodel:2.8.7
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.metrics:metrics-performance:1.0.0-beta01
-androidx.navigation:navigation-common-ktx:2.8.0
-androidx.navigation:navigation-common:2.8.0
-androidx.navigation:navigation-compose:2.8.0
-androidx.navigation:navigation-runtime-ktx:2.8.0
-androidx.navigation:navigation-runtime:2.8.0
+androidx.navigation:navigation-common-ktx:2.8.4
+androidx.navigation:navigation-common:2.8.4
+androidx.navigation:navigation-compose:2.8.4
+androidx.navigation:navigation-runtime-ktx:2.8.4
+androidx.navigation:navigation-runtime:2.8.4
 androidx.print:print:1.0.0
 androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05
 androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05
-androidx.profileinstaller:profileinstaller:1.3.1
+androidx.profileinstaller:profileinstaller:1.4.1
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common:2.6.1
 androidx.room:room-ktx:2.6.1
@@ -141,8 +142,8 @@ androidx.window.extensions.core:core:1.0.0
 androidx.window:window-core-android:1.3.0
 androidx.window:window-core:1.3.0
 androidx.window:window:1.3.0
-androidx.work:work-runtime-ktx:2.9.0
-androidx.work:work-runtime:2.9.0
+androidx.work:work-runtime-ktx:2.10.0
+androidx.work:work-runtime:2.10.0
 com.caverock:androidsvg-aar:1.4
 com.google.accompanist:accompanist-drawablepainter:0.32.0
 com.google.accompanist:accompanist-permissions:0.36.0
@@ -153,12 +154,12 @@ com.google.android.gms:play-services-ads-identifier:18.0.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-cloud-messaging:17.2.0
-com.google.android.gms:play-services-measurement-api:22.1.0
-com.google.android.gms:play-services-measurement-base:22.1.0
-com.google.android.gms:play-services-measurement-impl:22.1.0
-com.google.android.gms:play-services-measurement-sdk-api:22.1.0
-com.google.android.gms:play-services-measurement-sdk:22.1.0
-com.google.android.gms:play-services-measurement:22.1.0
+com.google.android.gms:play-services-measurement-api:22.1.2
+com.google.android.gms:play-services-measurement-base:22.1.2
+com.google.android.gms:play-services-measurement-impl:22.1.2
+com.google.android.gms:play-services-measurement-sdk-api:22.1.2
+com.google.android.gms:play-services-measurement-sdk:22.1.2
+com.google.android.gms:play-services-measurement:22.1.2
 com.google.android.gms:play-services-oss-licenses:17.1.0
 com.google.android.gms:play-services-stats:17.0.2
 com.google.android.gms:play-services-tasks:18.2.0
@@ -169,15 +170,15 @@ com.google.dagger:hilt-android:2.52
 com.google.dagger:hilt-core:2.52
 com.google.errorprone:error_prone_annotations:2.26.0
 com.google.firebase:firebase-abt:21.1.1
-com.google.firebase:firebase-analytics:22.1.0
+com.google.firebase:firebase-analytics:22.1.2
 com.google.firebase:firebase-annotations:16.2.0
-com.google.firebase:firebase-bom:33.3.0
+com.google.firebase:firebase-bom:33.7.0
 com.google.firebase:firebase-common-ktx:21.0.0
 com.google.firebase:firebase-common:21.0.0
 com.google.firebase:firebase-components:18.0.0
 com.google.firebase:firebase-config-interop:16.0.1
-com.google.firebase:firebase-config:22.0.0
-com.google.firebase:firebase-crashlytics:19.1.0
+com.google.firebase:firebase-config:22.0.1
+com.google.firebase:firebase-crashlytics:19.3.0
 com.google.firebase:firebase-datatransport:19.0.0
 com.google.firebase:firebase-encoders-json:18.0.1
 com.google.firebase:firebase-encoders-proto:16.0.0
@@ -186,16 +187,15 @@ com.google.firebase:firebase-iid-interop:17.1.0
 com.google.firebase:firebase-installations-interop:17.2.0
 com.google.firebase:firebase-installations:18.0.0
 com.google.firebase:firebase-measurement-connector:20.0.1
-com.google.firebase:firebase-messaging:24.0.1
-com.google.firebase:firebase-perf:21.0.1
-com.google.firebase:firebase-sessions:2.0.4
-com.google.firebase:protolite-well-known-types:18.0.0
+com.google.firebase:firebase-messaging:24.1.0
+com.google.firebase:firebase-perf:21.0.3
+com.google.firebase:firebase-sessions:2.0.7
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:31.1-android
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.protobuf:protobuf-javalite:4.26.1
-com.google.protobuf:protobuf-kotlin-lite:4.26.1
+com.google.protobuf:protobuf-javalite:4.28.2
+com.google.protobuf:protobuf-kotlin-lite:4.28.2
 com.squareup.okhttp3:logging-interceptor:4.12.0
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.9.0

app/prodRelease-badging.txt

@@ -1,6 +1,6 @@
-package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
 sdkVersion:'21'
-targetSdkVersion:'34'
+targetSdkVersion:'35'
 uses-permission: name='android.permission.INTERNET'
 uses-permission: name='android.permission.ACCESS_NETWORK_STATE'
 uses-permission: name='android.permission.POST_NOTIFICATIONS'

app/src/main/AndroidManifest.xml

@@ -41,6 +41,7 @@
 
         <activity
             android:name=".MainActivity"
+            android:windowSoftInputMode="adjustResize"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -38,7 +38,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
 
             extensions.configure<ApplicationExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
+                defaultConfig.targetSdk = 35
                 @Suppress("UnstableApiUsage")
                 testOptions.animationsDisabled = true
                 configureGradleManagedDevices(this)

build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt

@@ -21,6 +21,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.exclude
 
 class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -35,7 +36,10 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
                 val bom = libs.findLibrary("firebase-bom").get()
                 add("implementation", platform(bom))
                 "implementation"(libs.findLibrary("firebase.analytics").get())
-                "implementation"(libs.findLibrary("firebase.performance").get())
+                "implementation"(libs.findLibrary("firebase.performance").get()) {
+                    exclude(group = "com.google.protobuf", module = "protobuf-javalite")
+                    exclude(group = "com.google.firebase", module = "protolite-well-known-types")
+                }
                 "implementation"(libs.findLibrary("firebase.crashlytics").get())
             }
 

build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -39,7 +39,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
 
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
+                defaultConfig.targetSdk = 35
                 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 testOptions.animationsDisabled = true
                 configureFlavors(this)

build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt

@@ -31,7 +31,7 @@ class AndroidTestConventionPlugin : Plugin<Project> {
 
             extensions.configure<TestExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
+                defaultConfig.targetSdk = 35
                 configureGradleManagedDevices(this)
             }
         }

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt

@@ -36,7 +36,7 @@ internal fun Project.configureKotlinAndroid(
     commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
-        compileSdk = 34
+        compileSdk = 35
 
         defaultConfig {
             minSdk = 21

gradle/libs.versions.toml

@@ -1,38 +1,38 @@
 [versions]
 accompanist = "0.36.0"
-androidDesugarJdkLibs = "2.0.4"
+androidDesugarJdkLibs = "2.1.3"
 # AGP and tools should be updated together
 androidGradlePlugin = "8.6.1"
-androidTools = "31.7.2"
+androidTools = "31.7.3"
 androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
 androidxBrowser = "1.8.0"
 androidxComposeBom = "2024.11.00"
 androidxComposeRuntimeTracing = "1.7.5"
-androidxCore = "1.13.1"
+androidxCore = "1.15.0"
 androidxCoreSplashscreen = "1.0.1"
 androidxDataStore = "1.1.1"
 androidxEspresso = "3.6.1"
 androidxHiltNavigationCompose = "1.2.0"
-androidxLifecycle = "2.8.6"
-androidxMacroBenchmark = "1.3.1"
+androidxLifecycle = "2.8.7"
+androidxMacroBenchmark = "1.3.3"
 androidxMetrics = "1.0.0-beta01"
-androidxNavigation = "2.8.0"
-androidxProfileinstaller = "1.3.1"
+androidxNavigation = "2.8.4"
+androidxProfileinstaller = "1.4.1"
 androidxTestCore = "1.6.1"
 androidxTestExt = "1.2.1"
 androidxTestRules = "1.6.1"
 androidxTestRunner = "1.6.2"
 androidxTracing = "1.3.0-alpha02"
 androidxUiAutomator = "2.3.0"
 androidxWindowManager = "1.3.0"
-androidxWork = "2.9.0"
+androidxWork = "2.10.0"
 coil = "2.7.0"
 dependencyGuard = "0.5.0"
-firebaseBom = "33.3.0"
-firebaseCrashlyticsPlugin = "2.9.9"
+firebaseBom = "33.7.0"
+firebaseCrashlyticsPlugin = "3.0.2"
 firebasePerfPlugin = "1.4.2"
-gmsPlugin = "4.4.1"
+gmsPlugin = "4.4.2"
 googleOss = "17.1.0"
 googleOssPlugin = "0.10.6"
 hilt = "2.52"
@@ -46,7 +46,7 @@ kotlinxSerializationJson = "1.6.3"
 ksp = "2.0.20-1.0.25"
 moduleGraph = "2.7.1"
 okhttp = "4.12.0"
-protobuf = "4.26.1"
+protobuf = "4.28.2"
 protobufPlugin = "0.9.4"
 retrofit = "2.11.0"
 retrofitKotlinxSerializationJson = "1.0.0"

ui-test-hilt-manifest/src/main/kotlin/com/google/samples/apps/nowinandroid/uitesthiltmanifest/HiltComponentActivity.kt

@@ -16,6 +16,7 @@
 
 package com.google.samples.apps.nowinandroid.uitesthiltmanifest
 
+import android.os.Bundle
 import androidx.activity.ComponentActivity
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -24,4 +25,12 @@ import dagger.hilt.android.AndroidEntryPoint
  * for https://github.com/google/dagger/issues/3394
  */
 @AndroidEntryPoint
-class HiltComponentActivity : ComponentActivity()
+class HiltComponentActivity : ComponentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        // Use a no-action-bar theme to prevent overlapping with the action bar during tests.
+        // Theme_Material_Light_NoActionBar is the base theme used by the production app.
+        setTheme(android.R.style.Theme_Material_Light_NoActionBar)
+        super.onCreate(savedInstanceState)
+    }
+}