[Gradle, JS] Chaining build service disallowChanges
This commit is contained in:
committed by
Space Team
parent
55db7690d8
commit
e570f97db2
+1
-2
@@ -126,8 +126,7 @@ open class NodeJsRootPlugin : Plugin<Project> {
|
|||||||
YarnPlugin.apply(project)
|
YarnPlugin.apply(project)
|
||||||
|
|
||||||
npmInstall.configure {
|
npmInstall.configure {
|
||||||
it.npmResolutionManager.set(npmResolutionManager)
|
it.npmResolutionManager.value(npmResolutionManager).disallowChanges()
|
||||||
it.npmResolutionManager.disallowChanges()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
project.tasks.register("node" + CleanDataTask.NAME_SUFFIX, CleanDataTask::class.java) {
|
project.tasks.register("node" + CleanDataTask.NAME_SUFFIX, CleanDataTask::class.java) {
|
||||||
|
|||||||
+2
-4
@@ -71,10 +71,8 @@ class KotlinCompilationNpmResolver(
|
|||||||
|
|
||||||
it.compilationDisambiguatedName.set(compilation.disambiguatedName)
|
it.compilationDisambiguatedName.set(compilation.disambiguatedName)
|
||||||
|
|
||||||
it.npmResolutionManager.apply {
|
it.npmResolutionManager.value(npmResolutionManager)
|
||||||
set(npmResolutionManager)
|
.disallowChanges()
|
||||||
disallowChanges()
|
|
||||||
}
|
|
||||||
|
|
||||||
it.jsIrCompilation.set(compilation is KotlinJsIrCompilation)
|
it.jsIrCompilation.set(compilation is KotlinJsIrCompilation)
|
||||||
it.npmProjectName.set(npmProject.name)
|
it.npmProjectName.set(npmProject.name)
|
||||||
|
|||||||
+6
-12
@@ -111,20 +111,14 @@ abstract class KotlinPackageJsonTask :
|
|||||||
task.description = "Create package.json file for $compilation"
|
task.description = "Create package.json file for $compilation"
|
||||||
task.group = NodeJsRootPlugin.TASKS_GROUP_NAME
|
task.group = NodeJsRootPlugin.TASKS_GROUP_NAME
|
||||||
|
|
||||||
task.npmResolutionManager.apply {
|
task.npmResolutionManager.value(npmResolutionManager)
|
||||||
set(npmResolutionManager)
|
.disallowChanges()
|
||||||
disallowChanges()
|
|
||||||
}
|
|
||||||
|
|
||||||
task.gradleNodeModules.apply {
|
task.gradleNodeModules.value(gradleNodeModules)
|
||||||
set(gradleNodeModules)
|
.disallowChanges()
|
||||||
disallowChanges()
|
|
||||||
}
|
|
||||||
|
|
||||||
task.compositeNodeModules.apply {
|
task.compositeNodeModules.value(compositeNodeModules)
|
||||||
set(compositeNodeModules)
|
.disallowChanges()
|
||||||
disallowChanges()
|
|
||||||
}
|
|
||||||
|
|
||||||
task.packageJson.set(compilation.npmProject.packageJsonFile)
|
task.packageJson.set(compilation.npmProject.packageJsonFile)
|
||||||
|
|
||||||
|
|||||||
+2
-4
@@ -55,10 +55,8 @@ open class YarnPlugin : Plugin<Project> {
|
|||||||
task.group = NodeJsRootPlugin.TASKS_GROUP_NAME
|
task.group = NodeJsRootPlugin.TASKS_GROUP_NAME
|
||||||
task.description = "Create root package.json"
|
task.description = "Create root package.json"
|
||||||
|
|
||||||
task.npmResolutionManager.apply {
|
task.npmResolutionManager.value(kotlinNpmResolutionManager)
|
||||||
set(kotlinNpmResolutionManager)
|
.disallowChanges()
|
||||||
disallowChanges()
|
|
||||||
}
|
|
||||||
|
|
||||||
task.onlyIf {
|
task.onlyIf {
|
||||||
it as RootPackageJsonTask
|
it as RootPackageJsonTask
|
||||||
|
|||||||
Reference in New Issue
Block a user