a bit more tidying up

This commit is contained in:
Adam 2021-12-28 17:24:20 +01:00
parent de5f420621
commit 841f07c847
5 changed files with 10 additions and 12 deletions

View file

@ -1,7 +1,7 @@
package dev.adamko.kafkatorio.lang
import com.github.gradle.node.NodePlugin
import com.github.gradle.node.npm.task.NpmTask
import com.github.gradle.node.npm.task.NpmInstallTask
import dev.adamko.kafkatorio.gradle.areJsonPropertiesUpToDate
import dev.adamko.kafkatorio.gradle.not
import dev.adamko.kafkatorio.jsonMapper
@ -56,6 +56,6 @@ val updatePackageJson by tasks.registering(UpdatePackageJson::class) {
}
tasks.assemble { dependsOn(updatePackageJson) }
tasks.withType<NpmTask> {
tasks.withType<NpmInstallTask> {
dependsOn(updatePackageJson)
}

View file

@ -1,6 +1,6 @@
{
"name": "kafkatorio-events-mod",
"version": "0.1.5",
"version": "0.1.6",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View file

@ -9,8 +9,7 @@
"engines": {
"node": ">=10.13.0"
},
"devDependencies": {
},
"devDependencies": {},
"dependencies": {
"lua-types": "^2.11.0",
"@types/node": "^12.0.8",
@ -19,10 +18,7 @@
"typescript": "4.5.4"
},
"license": "UNLICENSED",
"peerDependencies": {
},
"optionalDependencies": {
},
"bundledDependencies": [
]
"peerDependencies": {},
"optionalDependencies": {},
"bundledDependencies": []
}

View file

@ -22,6 +22,8 @@ val deployModToServer by tasks.registering(Copy::class) {
description = "Copy the mod to the Factorio Docker server"
group = project.name
dependsOn(factorioMod)
from(
provider { factorioMod.incoming.artifacts.artifactFiles.files }
)

View file

@ -25,4 +25,4 @@ val dockerBuildKafkaPipe by tasks.registering(Exec::class) {
workingDir = dockerSrcDir.asFile
commandLine = parseSpaceSeparatedArgs(""" docker-compose build kafka-pipe """)
}
tasks.assemble { dependsOn(dockerBuildKafkaPipe) }
//tasks.assemble { dependsOn(dockerBuildKafkaPipe) }