From dfaeced98416ef6422683b1f7982135855001ef7 Mon Sep 17 00:00:00 2001 From: Konstantin Tskhovrebov Date: Wed, 6 Dec 2023 15:30:38 +0100 Subject: [PATCH] Handle a case when a module group name is empty in Gradle Plugin. And change error reporting to warning for unknown resource type --- .../org/jetbrains/compose/resources/GenerateResClassTask.kt | 4 ++-- .../jetbrains/compose/test/tests/integration/ResourcesTest.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/GenerateResClassTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/GenerateResClassTask.kt index 9b8c8fd44e0..0ca3666b263 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/GenerateResClassTask.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/GenerateResClassTask.kt @@ -79,7 +79,7 @@ abstract class GenerateResClassTask : DefaultTask() { val type = try { ResourceType.fromString(typeString) } catch (e: Exception) { - logger.error("e: Error: $path", e) + logger.warn("w: Skip file: $path\n${e.message}") return null } listOf(ResourceItem(type, qualifiers, file.nameWithoutExtension.asUnderscoredIdentifier(), path)) @@ -100,4 +100,4 @@ abstract class GenerateResClassTask : DefaultTask() { internal fun String.asUnderscoredIdentifier(): String = lowercase() .replace('-', '_') - .let { if (it.first().isDigit()) "_$it" else it } \ No newline at end of file + .let { if (it.isNotEmpty() && it.first().isDigit()) "_$it" else it } \ No newline at end of file diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt index 398c95d1fa9..2f79dc57aa0 100644 --- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt +++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt @@ -17,7 +17,7 @@ class ResourcesTest : GradlePluginTestBase() { file("expected/Res.kt") ) check.logContains(""" - java.lang.IllegalStateException: Unknown resource type: ignored + Unknown resource type: ignored """.trimIndent()) }