Skip to content

Commit 45d4a9d

Browse files
committed
Gradle, js: rename objects to avoid clashing with moowork nodejs plugin
#KT-31834 Fixed
1 parent b5515a3 commit 45d4a9d

File tree

6 files changed

+26
-23
lines changed

6 files changed

+26
-23
lines changed

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsPlugin.kt

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.gradle.api.Plugin
44
import org.gradle.api.Project
55
import org.gradle.api.plugins.BasePlugin
66
import org.gradle.api.tasks.Delete
7-
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.Companion.NODE_JS
7+
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.Companion.EXTENSION_NAME
88
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmResolveTask
99

1010
open class NodeJsPlugin : Plugin<Project> {
@@ -13,42 +13,50 @@ open class NodeJsPlugin : Plugin<Project> {
1313
"NodeJsPlugin can be applied only to root project"
1414
}
1515

16-
this.extensions.create(NODE_JS, NodeJsRootExtension::class.java, this)
16+
this.extensions.create(EXTENSION_NAME, NodeJsRootExtension::class.java, this)
1717

18-
val setupTask = tasks.create(NodeJsSetupTask.NAME, NodeJsSetupTask::class.java)
19-
val npmResolveTask = tasks.create(NpmResolveTask.NAME, NpmResolveTask::class.java)
20-
npmResolveTask.outputs.upToDateWhen { false }
18+
val setupTask = tasks.create(NodeJsSetupTask.NAME, NodeJsSetupTask::class.java) {
19+
it.group = TASKS_GROUP_NAME
20+
it.description = "Download and install a local node/npm version"
21+
}
2122

22-
npmResolveTask.dependsOn(setupTask)
23+
tasks.create(NpmResolveTask.NAME, NpmResolveTask::class.java) {
24+
it.dependsOn(setupTask)
25+
it.outputs.upToDateWhen { false }
26+
it.group = TASKS_GROUP_NAME
27+
it.description = "Find, download and link NPM dependencies and projects"
28+
}
2329

2430
setupCleanNodeModulesTask(project)
2531

2632
allprojects {
2733
if (it != project) {
28-
it.extensions.create(NODE_JS, NodeJsExtension::class.java, this)
34+
it.extensions.create(EXTENSION_NAME, NodeJsExtension::class.java, this)
2935
}
3036
}
3137
}
3238

3339
private fun setupCleanNodeModulesTask(project: Project) {
34-
project.tasks.create("cleanNodeModules", Delete::class.java) {
40+
project.tasks.create("cleanKotlinNodeModules", Delete::class.java) {
3541
it.description = "Deletes nodeJs projects created during build"
3642
it.group = BasePlugin.BUILD_GROUP
3743
it.delete.add(project.nodeJs.root.rootPackageDir)
3844
}
3945

40-
project.tasks.create("cleanGradleNodeModules", Delete::class.java) {
46+
project.tasks.create("cleanKotlinGradleNodeModules", Delete::class.java) {
4147
it.description = "Deletes node modules imported from gradle external modules"
4248
it.group = BasePlugin.BUILD_GROUP
4349
it.delete.add(project.nodeJs.root.nodeModulesGradleCacheDir)
4450
}
4551
}
4652

4753
companion object {
54+
const val TASKS_GROUP_NAME: String = "nodeJs"
55+
4856
fun apply(project: Project): NodeJsExtension {
4957
val rootProject = project.rootProject
5058
rootProject.plugins.apply(NodeJsPlugin::class.java)
51-
return rootProject.extensions.getByName(NODE_JS) as NodeJsExtension
59+
return rootProject.extensions.getByName(EXTENSION_NAME) as NodeJsExtension
5260
}
5361
}
5462
}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ open class NodeJsRootExtension(project: Project) : NodeJsExtension(project) {
7676
}
7777

7878
companion object {
79-
const val NODE_JS: String = "nodeJs"
79+
const val EXTENSION_NAME: String = "kotlinNodeJs"
8080

8181
operator fun get(project: Project) = NodeJsPlugin.apply(project.rootProject) as NodeJsRootExtension
8282
}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsSetupTask.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ open class NodeJsSetupTask : DefaultTask() {
1414
private val settings = project.nodeJs.root
1515
private val env by lazy { settings.environment }
1616

17-
init {
18-
group = NodeJsRootExtension.NODE_JS
19-
description = "Download and install a local node/npm version."
20-
}
21-
2217
val ivyDependency: String
2318
@Input get() = env.ivyDependency
2419

@@ -93,6 +88,6 @@ open class NodeJsSetupTask : DefaultTask() {
9388
}
9489

9590
companion object {
96-
const val NAME: String = "nodeJsSetup"
91+
const val NAME: String = "kotlinNodeJsSetup"
9792
}
9893
}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmResolveTask.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ open class NpmResolveTask : AbstractTask() {
1515
}
1616

1717
companion object {
18-
const val NAME = "npmResolve"
18+
const val NAME = "kotlinNpmResolve"
1919
}
2020
}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnRootExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ open class YarnRootExtension(val project: Project) {
4444
)
4545

4646
companion object {
47-
const val YARN: String = "yarn"
47+
const val YARN: String = "kotlinYarn"
4848

4949
operator fun get(project: Project): YarnRootExtension {
5050
val rootProject = project.rootProject

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import de.undercouch.gradle.tasks.download.DownloadAction
99
import org.gradle.api.DefaultTask
1010
import org.gradle.api.tasks.Input
1111
import org.gradle.api.tasks.OutputDirectory
12-
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
12+
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsPlugin
1313
import java.io.File
1414
import javax.xml.ws.Action
1515

@@ -26,8 +26,8 @@ open class YarnSetupTask : DefaultTask() {
2626
@OutputDirectory get() = env.home
2727

2828
init {
29-
group = NodeJsRootExtension.NODE_JS
30-
description = "Download and install a local yarn version."
29+
group = NodeJsPlugin.TASKS_GROUP_NAME
30+
description = "Download and install a local yarn version"
3131

3232
onlyIf {
3333
!settings.installationDir.exists()
@@ -62,6 +62,6 @@ open class YarnSetupTask : DefaultTask() {
6262
}
6363

6464
companion object {
65-
const val NAME: String = "yarnSetup"
65+
const val NAME: String = "kotlinYarnSetup"
6666
}
6767
}

0 commit comments

Comments
 (0)