lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UpdatePackageJson task is updated based on a json object, and move npm versions to libs.versions.toml

Browse source
This commit is contained in:
Adam 2022-08-13 11:59:30 +02:00
parent 2733dc4f62
commit d9f5d6d46d
7 changed files with 152 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/events-mod/build.gradle.kts
View file

@ -4,6 +4,8 @@ import dev.adamko.kafkatorio.gradle.asProvider
import dev.adamko.kafkatorio.gradle.factorioModAttributes
import dev.adamko.kafkatorio.gradle.typescriptAttributes
import dev.adamko.kafkatorio.task.TypescriptToLuaTask
import kotlinx.serialization.json.put
import kotlinx.serialization.json.putJsonObject
import net.swiftzer.semver.SemVer
import org.apache.tools.ant.filters.ReplaceTokens
import org.gradle.plugins.ide.idea.model.Module as IdeaImlModule
@ -175,15 +177,26 @@ val factorioModProvider by configurations.registering {
}
val packageJsonName: Provider<String> = providers.provider { "${rootProject.name}-${project.name}" }
val pjProvider: RegularFileProperty =
objects.fileProperty().convention(layout.projectDirectory.file("package.json"))
val projectPackageJsonName: Provider<String> =
providers.provider { "${rootProject.name}-${project.name}" }
val projectPackageJsonFile: RegularFile = layout.projectDirectory.file("package.json")
val projectVersion: Provider<String> = providers.provider { "${project.version}" }
tasks.updatePackageJson {
// mustRunAfter(tasks.npmInstall)
inputs.property("packageJsonName", packageJsonName)
propertiesToCheck.put("name", packageJsonName)
packageJsonFile.set(pjProvider)
updateExpectedJson {
put("name", projectPackageJsonName.get())
putJsonObject("dependencies") {
put("lua-types", libs.versions.npm.luaTypes.get())
put("typescript-to-lua", libs.versions.npm.typescriptToLua.get())
put("typed-factorio", libs.versions.npm.typedFactorio.get())
put("typescript", libs.versions.npm.typescript.get())
}
}
packageJsonFile.set(projectPackageJsonFile)
}

24
modules/events-mod/package-lock.json generated
View file

@ -32,17 +32,17 @@
}
},
"is-core-module": {
"version": "2.9.0",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
"integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
"integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
"requires": {
"has": "^1.0.3"
}
},
"lua-types": {
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/lua-types/-/lua-types-2.11.0.tgz",
"integrity": "sha512-J/8qHrOjkZuPBDhnuAg0DWoaJEImqXNzgEnUigCTVrSVCcchM5Y5zpcI3aWAZPhuZlb0QKC/f3nc7VGmZmBg7w=="
"version": "2.12.0",
"resolved": "https://registry.npmjs.org/lua-types/-/lua-types-2.12.0.tgz",
"integrity": "sha512-s96z1Zcz3KRXfWyNFM3KP2zpNYTfZwgHo8X/yFXveyS8Dux+cUuyT+zA5tFZbmGh8VViwNs9bFbzNevAR/18uw=="
},
"path-parse": {
"version": "1.0.7",
@ -75,9 +75,9 @@
"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
},
"typed-factorio": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.4.0.tgz",
"integrity": "sha512-hT5YDtdJk/hVIm83hYlXx2vOSmhElQhHhcI0OIrdx2nmrx18zKEnjGk4abJ6WHjuy4xoVZ+00mjnC3mWclvrzw=="
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.6.1.tgz",
"integrity": "sha512-ehxUmRUPO4IEhtXIOkwhosDGGEVgRBFVaoNkTOvko/3yLKwese/6IB1/9ItSRNspqOoNh4UBPscjvQWM3SIFBA=="
},
"typescript": {
"version": "4.7.4",
@ -85,9 +85,9 @@
"integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="
},
"typescript-to-lua": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.7.1.tgz",
"integrity": "sha512-iDjCnel38p3Cxv+Las8rBzd6BaRIE49DQSyFOgupg4gSw36+8H1xtwde3lRdGMPZx19/zVwXEO8UspiACYJc+A==",
"version": "1.8.2",
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.8.2.tgz",
"integrity": "sha512-2ZFJlF9R9HgTryM+Vwk3X3Dexnvpm5vT75Eh66E0rDFZGK+vW70aqkw6s47/ytdJg/9IyN+Oz7ITUzZxXEOxlA==",
"requires": {
"enhanced-resolve": "^5.8.2",
"resolve": "^1.15.1",

6
modules/events-mod/package.json
View file

@ -11,9 +11,9 @@
},
"devDependencies": {},
"dependencies": {
"lua-types": "^2.11.0",
"typescript-to-lua": "1.7.1",
"typed-factorio": "1.4.0",
"lua-types": "2.12.0",
"typescript-to-lua": "1.8.2",
"typed-factorio": "1.6.1",
"typescript": "4.7.4"
},
"license": "UNLICENSED",