Merge remote-tracking branch 'upstream/main'

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=''
+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'

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

@@ -108,7 +108,7 @@ abstract class CheckBadgingTask : DefaultTask() {
 }
 
 private fun String.capitalized() = replaceFirstChar {
-    if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
+    if (it.isLowerCase()) it.titlecase() else it.toString()
 }
 
 fun Project.configureBadgingTasks(

build.gradle.kts

@@ -31,7 +31,13 @@ buildscript {
 
 }
 
-// Lists all plugins used throughout the project
+/*
+ * By listing all the plugins used throughout all subprojects in the root project build script, it
+ * ensures that the build script classpath remains the same for all projects. This avoids potential
+ * problems with mismatching versions of transitive plugin dependencies. A subproject that applies
+ * an unlisted plugin will have that plugin and its dependencies _appended_ to the classpath, not
+ * replacing pre-existing dependencies.
+ */
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false

compose_compiler_config.conf

@@ -1,5 +1,5 @@
 // This file contains classes (with possible wildcards) that the Compose Compiler will treat as stable.
-// It allows us to define classes that our not part of our codebase without wrapping them in a stable class.
+// It allows us to define classes that are not part of our codebase without wrapping them in a stable class.
 // For more information, check https://developer.android.com/jetpack/compose/performance/stability/fix#configuration-file
 
 // We always use immutable classes for our data model, to avoid running the Compose compiler

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 accompanist = "0.36.0"
 androidDesugarJdkLibs = "2.1.2"
 # AGP and tools should be updated together
-androidGradlePlugin = "8.6.0"
+androidGradlePlugin = "8.6.1"
 androidTools = "31.6.1"
 androidxActivity = "1.9.2"
 androidxAppCompat = "1.7.0"