From 9a4990b110d4b7784824603473f79e5924cf9653 Mon Sep 17 00:00:00 2001 From: Konstantin Tskhovrebov Date: Wed, 8 May 2024 12:13:09 +0200 Subject: [PATCH] [gradle] Rename 'compose.resources.multimodule.enable, to 'org.jetbrains.compose.resources.multimodule.enable' --- .../desktop/application/internal/ComposeProjectProperties.kt | 2 +- .../org/jetbrains/compose/resources/ComposeResources.kt | 2 +- .../jetbrains/compose/test/tests/integration/ResourcesTest.kt | 4 ++-- .../misc/kmpResourcePublication/gradle.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ComposeProjectProperties.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ComposeProjectProperties.kt index 8ff3a45a83..82e448975b 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ComposeProjectProperties.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ComposeProjectProperties.kt @@ -22,7 +22,7 @@ internal object ComposeProperties { internal const val MAC_NOTARIZATION_PASSWORD = "compose.desktop.mac.notarization.password" internal const val MAC_NOTARIZATION_TEAM_ID_PROVIDER = "compose.desktop.mac.notarization.teamID" internal const val CHECK_JDK_VENDOR = "compose.desktop.packaging.checkJdkVendor" - internal const val ENABLE_MULTIMODULE_RESOURCES = "compose.resources.multimodule.enable" + internal const val ENABLE_MULTIMODULE_RESOURCES = "org.jetbrains.compose.resources.multimodule.enable" internal const val SYNC_RESOURCES_PROPERTY = "compose.ios.resources.sync" fun isVerbose(providers: ProviderFactory): Provider = diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ComposeResources.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ComposeResources.kt index 5be836cb2a..76d24cbaf1 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ComposeResources.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ComposeResources.kt @@ -52,7 +52,7 @@ private fun Project.onKgpApplied(config: Provider, kgp: Kotl logger.info( """ Multimodule Compose Resources are disabled by default. - To enable it add 'compose.resources.multimodule.enable=true' int the root gradle.properties file. + To enable it, add 'org.jetbrains.compose.resources.multimodule.enable=true' to the root gradle.properties file. """.trimIndent() ) } else { 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 f64a0cb855..87d6348f0c 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 @@ -334,12 +334,12 @@ class ResourcesTest : GradlePluginTestBase() { testProject("misc/kmpResourcePublication", environment) ) { file("gradle.properties").modify { content -> - content.replace("compose.resources.multimodule.enable=true", "") + content.replace("org.jetbrains.compose.resources.multimodule.enable=true", "") } gradle(":cmplib:build").checks { check.logContains("Multimodule Compose Resources are disabled by default.") - check.logContains("To enable it add 'compose.resources.multimodule.enable=true' int the root gradle.properties file.") + check.logContains("To enable it, add 'org.jetbrains.compose.resources.multimodule.enable=true' to the root gradle.properties file.") } } } diff --git a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/gradle.properties b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/gradle.properties index c65ddc29dd..eb3f05639f 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/gradle.properties +++ b/gradle-plugins/compose/src/test/test-projects/misc/kmpResourcePublication/gradle.properties @@ -5,4 +5,4 @@ android.useAndroidX=true org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.wasm.enabled=true -compose.resources.multimodule.enable=true +org.jetbrains.compose.resources.multimodule.enable=true