Rebase onto main

Change-Id: I325fd526118b21f56a194cb070b3bfd267a6e241

gradle/libs.versions.toml

@@ -40,7 +40,7 @@ ksp = "1.7.10-1.0.6"
 ktlint = "0.43.0"
 lint = "30.2.2"
 okhttp = "4.10.0"
-paparazzi = "1.0.0"
+paparazzi = "1.1.0-sdk33-alpha02"
 protobuf = "3.21.5"
 protobufPlugin = "0.8.19"
 retrofit = "2.9.0"
@@ -136,7 +136,8 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazzi" }
+# Using fork of Paparazzi for API 33 support: https://github.com/chrisbanes/paparazzi/pull/2
+paparazzi = { id = "dev.chrisbanes.paparazzi", version.ref = "paparazzi" }
 protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" }
 secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }

preview-screenshots/build.gradle.kts

@@ -44,11 +44,11 @@ androidComponents {
 }
 
 dependencies {
-    implementation(project(":core-ui"))
-    implementation(project(":feature-author"))
-    implementation(project(":feature-foryou"))
-    implementation(project(":feature-interests"))
-    implementation(project(":feature-topic"))
+    implementation(project(":core:ui"))
+    implementation(project(":feature:author"))
+    implementation(project(":feature:foryou"))
+    implementation(project(":feature:interests"))
+    implementation(project(":feature:topic"))
 
     implementation(libs.showkase.runtime)
     ksp(libs.showkase.processor)

preview-screenshots/src/test/java/com/google/samples/apps/nowinandroid/PreviewScreenshotTests.kt

@@ -16,6 +16,7 @@
 
 package com.google.samples.apps.nowinandroid
 
+import android.os.Build
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -32,6 +33,8 @@ import com.google.testing.junit.testparameterinjector.TestParameterInjector
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.lang.reflect.Field
+import java.lang.reflect.Modifier
 
 class ComponentPreview(
     private val showkaseBrowserComponent: ShowkaseBrowserComponent
@@ -59,7 +62,14 @@ class PreviewScreenshotTests {
     @get:Rule
     val paparazzi = Paparazzi(
         maxPercentDifference = 0.0,
-    )
+    ).also {
+        val modifiersField = Field::class.java.getDeclaredField("modifiers")
+        modifiersField.isAccessible = true
+        val codenameField = Build.VERSION::class.java.getField("CODENAME")
+        modifiersField.setInt(codenameField, codenameField.modifiers and Modifier.FINAL.inv())
+        codenameField.isAccessible = true
+        codenameField.set(null, "REL")
+    }
 
     @Test
     fun preview_tests(