Skip to content

Commit 4ec1d1a

Browse files
author
Oleksandr Dzhychko
authored
Merge pull request #859 from modelix/avoid-task-configuration-in-gradle-builds
build: avoid task configuration in Grade builds
2 parents d4fd047 + 3616c33 commit 4ec1d1a

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

model-api-gen-gradle-test/typescript-generation/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id("org.modelix.model-api-gen") apply false
77
}
88

9-
val updateDependencies = tasks.create<NpmTask>("updateDependencies") {
9+
val updateDependencies = tasks.register<NpmTask>("updateDependencies") {
1010
args.set(
1111
listOf(
1212
"install",

model-api-gen-gradle-test/vue-integration/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
alias(libs.plugins.node)
66
}
77

8-
val updateDependencies = tasks.create<NpmTask>("updateDependencies") {
8+
val updateDependencies = tasks.register<NpmTask>("updateDependencies") {
99
dependsOn(":typescript-generation:packJsPackage")
1010
args.set(
1111
listOf(

modelql-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ kotlin {
7474
}
7575
}
7676

77-
val generateVersionVariable by tasks.creating {
77+
val generateVersionVariable by tasks.registering {
7878
doLast {
7979
val outputDir = project.layout.buildDirectory.dir("version_gen/org/modelix/modelql/core").get().asFile
8080
outputDir.mkdirs()

ts-model-api/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ val npmRunBuild = tasks.named("npm_run_build") {
1313
outputs.dir("dist")
1414
}
1515

16-
val patchKotlinExternals = tasks.create("patchKotlinExternals") {
16+
val patchKotlinExternals = tasks.register("patchKotlinExternals") {
1717
dependsOn("npm_run_generateKotlin")
1818
doLast {
1919
val annotationLine = """@file:JsModule("@modelix/ts-model-api") @file:JsNonModule"""
@@ -51,7 +51,7 @@ tasks.named("npm_run_generateKotlin") {
5151
// With `NpmPackage.files` we cannot copy the "dist" directory into `destinationDir`.
5252
// We can only either copy the files from "dist" directly into `destinationDir`
5353
// or copy all files from `projectDir` into `destinationDir`.
54-
val copyBuildTypeScriptForPackaging = tasks.create<Copy>("copyBuildTypeScriptForPackaging") {
54+
val copyBuildTypeScriptForPackaging = tasks.register<Copy>("copyBuildTypeScriptForPackaging") {
5555
dependsOn(npmRunBuild)
5656
from(projectDir)
5757
include("dist/**")
@@ -74,7 +74,7 @@ npmPublish {
7474
version.set("${project.version}")
7575
}
7676
files {
77-
setFrom(copyBuildTypeScriptForPackaging.outputs)
77+
setFrom(copyBuildTypeScriptForPackaging.map { it.outputs })
7878
}
7979
}
8080
}

vue-model-api/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010
id("modelix-project-repositories")
1111
}
1212

13-
val updateModelClient = tasks.create<NpmTask>("updateModelClient") {
13+
val updateModelClient = tasks.register<NpmTask>("updateModelClient") {
1414
val modelClientPackage = "../model-client/build/npmDevPackage/model-client.tgz"
1515
inputs.file(modelClientPackage)
1616
outputs.cacheIf { true }
@@ -49,7 +49,7 @@ tasks.named("npm_run_lint") {
4949
}
5050

5151
val packageJsonForProd = layout.buildDirectory.file("package-for-publishing.json").get().asFile
52-
val createPackageJsonForPublishing = tasks.create("createPackageJsonForPublishing") {
52+
val createPackageJsonForPublishing = tasks.register("createPackageJsonForPublishing") {
5353
dependsOn(updateModelClient)
5454

5555
val packageJsonForDev = projectDir.resolve("package.json")

0 commit comments

Comments
 (0)