Merge remote-tracking branch 'goog/main' into nov11-merge

* goog/main:
  New version to trigger new build on server
  Remove applicationIdSuffix from demo variant, add it to prod instead
  Updates Navigation approach with new guidance

Change-Id: Ia489bf99ed68e53c318c9a0457edfb2f61de8ad1

app/build.gradle.kts

@@ -26,8 +26,8 @@ plugins {
 android {
     defaultConfig {
         applicationId = "com.google.samples.apps.nowinandroid"
-        versionCode = 2
-        versionName = "0.0.2" // X.Y.Z; X = Major, Y = minor, Z = Patch level
+        versionCode = 3
+        versionName = "0.0.3" // X.Y.Z; X = Major, Y = minor, Z = Patch level
 
         // Custom test runner to set up Hilt dependency graph
         testInstrumentationRunner = "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"

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

@@ -14,8 +14,8 @@ enum class FlavorDimension {
 // purposes, or from a production backend server which supplies up-to-date, real content.
 // These two product flavors reflect this behaviour.
 enum class Flavor (val dimension : FlavorDimension, val applicationIdSuffix : String? = null) {
-    demo(FlavorDimension.contentType, ".demo"),
-    prod(FlavorDimension.contentType)
+    demo(FlavorDimension.contentType),
+    prod(FlavorDimension.contentType, ".prod")
 }
 
 fun Project.configureFlavors(