Merge pull request #52 from goncalossilva/goncalossilva/add-compilati…

…on-name-to-task
goncalossilva · Mar 29, 2023 · 34c23de · 34c23de
2 parents f2e3406 + fc93747
commit 34c23de
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ Notable changes are documented in this file, whose format follows [Keep a Change
 
 ## [Unreleased]
 
+### Changed
+
+- Added compilation name to task names to avoid colliding with [moko-resources](https://github.com/icerockdev/moko-resources). E.g., `copyResourcesDebugTestEtc` becomes `copyTestResourcesDebugTestEtc`.
+
 ## [0.3.0] - 2023-03-23
 
 ### Added

diff --git a/resources-plugin/src/main/kotlin/ResourcesPlugin.kt b/resources-plugin/src/main/kotlin/ResourcesPlugin.kt
@@ -47,7 +47,11 @@ class ResourcesPlugin : KotlinCompilerPluginSupportPlugin {
             target.binaries.forEach { binary ->
                 setupCopyResourcesTask(
                     kotlinCompilation = kotlinCompilation,
-                    taskName = getTaskName("copyResources", binary.name, target.targetName),
+                    taskName = getTaskName(
+                        "copy",
+                        kotlinCompilation.compilationName,
+                        "resources",kotlinCompilation.target.targetName
+                    ),
                     outputDirectory = binary.outputDirectory,
                     mustRunAfterTasks = listOf(kotlinCompilation.processResourcesTaskName),
                     dependantTasks = listOf(binary.linkTaskName)
@@ -61,7 +65,11 @@ class ResourcesPlugin : KotlinCompilerPluginSupportPlugin {
         if (isJsNodeCompilation(kotlinCompilation) || isJsBrowserCompilation(kotlinCompilation)) {
             setupCopyResourcesTask(
                 kotlinCompilation = kotlinCompilation,
-                taskName = getTaskName("copyResources", kotlinCompilation.target.targetName),
+                taskName = getTaskName(
+                    "copy",
+                    kotlinCompilation.compilationName,
+                    "resources",kotlinCompilation.target.targetName
+                ),
                 outputDirectory = kotlinCompilation.npmProject.dir,
                 mustRunAfterTasks = mutableListOf(kotlinCompilation.processResourcesTaskName).apply {
                     kotlinCompilation.npmProject.nodeJs.npmInstallTaskProvider?.let {
@@ -79,7 +87,11 @@ class ResourcesPlugin : KotlinCompilerPluginSupportPlugin {
         if (isJsBrowserCompilation(kotlinCompilation)) {
             setupProxyResourcesTask(
                 kotlinCompilation = kotlinCompilation,
-                taskName = getTaskName("proxyResources", kotlinCompilation.target.targetName),
+                taskName = getTaskName(
+                    "proxy",
+                    kotlinCompilation.compilationName,
+                    "resources",kotlinCompilation.target.targetName
+                ),
                 // Task where karma.conf.js is created, in KotlinKarma.createTestExecutionSpec.
                 mustRunAfterTask = kotlinCompilation.processResourcesTaskName,
                 dependantTask = kotlinCompilation.compileKotlinTaskName