From 81ecd97d074aaf932bbe9cb7725c3b68f6de69ec Mon Sep 17 00:00:00 2001 From: Erik Hellman Date: Wed, 16 Oct 2024 11:37:55 +0200 Subject: [PATCH 1/3] Re-enable configuration-cache Configuration-cache seems to have been disabled by mistake. Fixes #1668 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7594c8ce1..e2d6e0903 100644 --- a/gradle.properties +++ b/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. From bd557fd6045e15c29f2c4ec9a9290117844545f6 Mon Sep 17 00:00:00 2001 From: Don Turner Date: Mon, 21 Oct 2024 15:29:07 +0100 Subject: [PATCH 2/3] Reduce icon sizes --- .../google/samples/apps/nowinandroid/core/ui/InterestsItem.kt | 2 +- .../samples/apps/nowinandroid/feature/topic/TopicScreen.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/InterestsItem.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/InterestsItem.kt index 28cd8d938..c74a21ed5 100644 --- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/InterestsItem.kt +++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/InterestsItem.kt @@ -54,7 +54,7 @@ fun InterestsItem( ) { ListItem( leadingContent = { - InterestsIcon(topicImageUrl, iconModifier.size(64.dp)) + InterestsIcon(topicImageUrl, iconModifier.size(48.dp)) }, headlineContent = { Text(text = name) diff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt index 13fbab784..a18d9988a 100644 --- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt +++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt @@ -212,7 +212,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), ) Text(name, style = MaterialTheme.typography.displayMedium) From 489aebf6294891bee0d9d0d60445b36417d96e86 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Thu, 24 Oct 2024 11:27:33 +0900 Subject: [PATCH 3/3] Fix duplicated implementation of hilt. (#1570) Change-Id: I82c2e06b594297cdae7009ee5e87162d0295eb7c --- .../convention/src/main/kotlin/HiltConventionPlugin.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt b/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt index a8228e5af..f49366f75 100644 --- a/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/HiltConventionPlugin.kt @@ -26,7 +26,13 @@ class HiltConventionPlugin : Plugin { 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] */