diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 91135ae..4e68cf3 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ object Versions { // const val kotlin = "1.6.20-M1" const val kotlin = "1.6.10" - const val gradleNodePlugin = "3.2.0" + const val gradleNodePlugin = "3.2.1" const val gradleDockerComposePlugin = "0.15.0" const val kotlinXSerialization = "1.3.2" diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/task/TypescriptToLuaTask.kt b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/task/TypescriptToLuaTask.kt index 3c6f797..0aaa4cb 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/task/TypescriptToLuaTask.kt +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/task/TypescriptToLuaTask.kt @@ -4,7 +4,7 @@ import com.github.gradle.node.npm.task.NpmTask import org.gradle.api.file.DirectoryProperty import org.gradle.api.plugins.BasePlugin import org.gradle.api.tasks.InputDirectory -import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.PathSensitive import org.gradle.api.tasks.PathSensitivity import org.gradle.api.tasks.SkipWhenEmpty @@ -17,7 +17,7 @@ abstract class TypescriptToLuaTask : NpmTask() { @get:PathSensitive(PathSensitivity.RELATIVE) abstract val sourceFiles: DirectoryProperty - @get:OutputFile + @get:OutputDirectory abstract val outputDirectory: DirectoryProperty @@ -26,18 +26,8 @@ abstract class TypescriptToLuaTask : NpmTask() { super.setDescription("Convert Typescript To Lua") super.execOverrides { standardOutput = System.out } super.npmCommand.set(listOf("run", "build")) - super.args.set(parseSpaceSeparatedArgs("-- --outDir $temporaryDir")) super.ignoreExitValue.set(false) - super.doFirst("cleanTemporaryDir") { - project.delete(temporaryDir) - project.mkdir(temporaryDir) - } - super.doLast("syncTstlOutput") { - project.sync { - from(temporaryDir) - into(outputDirectory) - } - } + super.args.set(parseSpaceSeparatedArgs("-- --outDir $temporaryDir")) } } diff --git a/modules/events-mod/build.gradle.kts b/modules/events-mod/build.gradle.kts index 73e8687..3fb9ec1 100644 --- a/modules/events-mod/build.gradle.kts +++ b/modules/events-mod/build.gradle.kts @@ -59,6 +59,17 @@ val typescriptToLua by tasks.registering(TypescriptToLuaTask::class) { sourceFiles.set(tsSrcDir) outputDirectory.set(layout.buildDirectory.dir("typescriptToLua")) + + doFirst("cleanTemporaryDir") { + delete(temporaryDir) + mkdir(temporaryDir) + } + doLast("syncTstlOutput") { + sync { + from(temporaryDir) + into(outputDirectory) + } + } } val installEventsTsSchema by tasks.registering(Sync::class) { diff --git a/modules/events-mod/src/main/typescript/package.json b/modules/events-mod/src/main/typescript/package.json index 973f8aa..a14305b 100644 --- a/modules/events-mod/src/main/typescript/package.json +++ b/modules/events-mod/src/main/typescript/package.json @@ -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.5" }, "license": "UNLICENSED", - "peerDependencies": { - }, - "optionalDependencies": { - }, - "bundledDependencies": [ - ] + "peerDependencies": {}, + "optionalDependencies": {}, + "bundledDependencies": [] }