Merge remote-tracking branch 'upstream/main'

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

@@ -26,7 +26,13 @@ class HiltConventionPlugin : Plugin<Project> {
             pluginManager.apply("com.google.devtools.ksp")
             dependencies {
                 add("ksp", libs.findLibrary("hilt.compiler").get())
-                add("implementation", libs.findLibrary("hilt.core").get())
+            }
+
+            // Add support for Jvm Module, base on org.jetbrains.kotlin.jvm
+            pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
+                dependencies {
+                    add("implementation", libs.findLibrary("hilt.core").get())
+                }
             }
 
             /** Add support for Android modules, based on [AndroidBasePlugin] */

core/ui/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/ui/InterestsItem.kt

@@ -58,7 +58,7 @@ fun InterestsItem(
 ) {
     ListItem(
         leadingContent = {
-            InterestsIcon(topicImageUrl, iconModifier.size(64.dp))
+            InterestsIcon(topicImageUrl, iconModifier.size(48.dp))
         },
         headlineContent = {
             Text(text = name)

feature/topic/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt

@@ -215,7 +215,7 @@ private fun TopicHeader(name: String, description: String, imageUrl: String) {
             contentDescription = null,
             modifier = Modifier
                 .align(Alignment.CenterHorizontally)
-                .size(216.dp)
+                .size(132.dp)
                 .padding(bottom = 12.dp),
             imageLoader = ImageLoader(LocalPlatformContext.current),
         )

gradle.properties

@@ -38,7 +38,7 @@ org.gradle.configureondemand=false
 org.gradle.caching=true
 
 # Enable configuration caching between builds.
-org.gradle.configuration-cache=false
+org.gradle.configuration-cache=true
 # This option is set because of https://github.com/google/play-services-plugins/issues/246
 # to generate the Configuration Cache regardless of incompatible tasks.
 # See https://github.com/android/nowinandroid/issues/1022 before using it.