project version bump to 0.6.0, and bump kotest, tstl, typescript
This commit is contained in:
Adam
parent
a225b65901
commit
0398e2026d
11 changed files with 74 additions and 88 deletions
|
|
@ -19,8 +19,6 @@ description = "Sends in-game information to a server over the internet (requires
|
|||
// Factorio required format is:
|
||||
// - filename: `mod-name_version.zip`
|
||||
// - zip contains one directory, `mod-name`
|
||||
|
||||
|
||||
//val modName: String by extra { "${rootProject.name}-events" }
|
||||
extra.set("modName", "kafkatorio-events")
|
||||
val modName = extra.get("modName") as String
|
||||
|
|
@ -161,34 +159,6 @@ tasks.withType<Zip>().configureEach {
|
|||
}
|
||||
|
||||
|
||||
//val downloadFactorioApiDocs by tasks.registering {
|
||||
// group = project.name
|
||||
//
|
||||
// val target = uri("https://lua-api.factorio.com/latest/runtime-api.json")
|
||||
// val apiFilename = File(target.path).name
|
||||
// val downloadedFile = file("$temporaryDir/$apiFilename")
|
||||
//
|
||||
// val apiFile = layout.buildDirectory.file(apiFilename)
|
||||
// outputs.file(apiFile)
|
||||
//
|
||||
// doLast {
|
||||
//
|
||||
// ant.invokeMethod(
|
||||
// "get", mapOf(
|
||||
// "src" to target,
|
||||
// "dest" to downloadedFile,
|
||||
// "verbose" to true,
|
||||
// )
|
||||
// )
|
||||
//
|
||||
// val json = downloadedFile.readText()
|
||||
// val prettyJson = JsonOutput.prettyPrint(json)
|
||||
//
|
||||
// apiFile.get().asFile.writeText(prettyJson)
|
||||
//
|
||||
// logger.lifecycle("Downloaded Factorio API json: $apiFile")
|
||||
// }
|
||||
//}
|
||||
|
||||
val factorioModProvider by configurations.registering {
|
||||
asProvider()
|
||||
|
|
@ -212,6 +182,24 @@ tasks.updatePackageJson {
|
|||
tasks.assemble { dependsOn(installEventsTsSchema, tasks.updatePackageJson) }
|
||||
|
||||
|
||||
idea {
|
||||
module {
|
||||
sourceDirs = sourceDirs + file("src/main/typescript")
|
||||
resourceDirs = resourceDirs + file("src/main/resources")
|
||||
testSourceDirs = testSourceDirs + file("src/test/typescript")
|
||||
iml {
|
||||
whenMerged {
|
||||
require(this is org.gradle.plugins.ide.idea.model.Module)
|
||||
|
||||
sourceDirs = sourceDirs + file("src/main/typescript")
|
||||
resourceDirs = resourceDirs + file("src/main/resources")
|
||||
testSourceDirs = testSourceDirs + file("src/test/typescript")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// trying to get Gradle+idea to recognise the ts-src...
|
||||
|
||||
//val typescriptSrcSet = project.objects.sourceDirectorySet("typescript", "TypeScript").apply {
|
||||
|
|
@ -242,20 +230,31 @@ tasks.assemble { dependsOn(installEventsTsSchema, tasks.updatePackageJson) }
|
|||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
idea {
|
||||
module {
|
||||
sourceDirs = sourceDirs + file("src/main/typescript")
|
||||
resourceDirs = resourceDirs + file("src/main/resources")
|
||||
testSourceDirs = testSourceDirs + file("src/test/typescript")
|
||||
iml {
|
||||
whenMerged {
|
||||
require(this is org.gradle.plugins.ide.idea.model.Module)
|
||||
|
||||
sourceDirs = sourceDirs + file("src/main/typescript")
|
||||
resourceDirs = resourceDirs + file("src/main/resources")
|
||||
testSourceDirs = testSourceDirs + file("src/test/typescript")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//val downloadFactorioApiDocs by tasks.registering {
|
||||
// group = project.name
|
||||
//
|
||||
// val target = uri("https://lua-api.factorio.com/latest/runtime-api.json")
|
||||
// val apiFilename = File(target.path).name
|
||||
// val downloadedFile = file("$temporaryDir/$apiFilename")
|
||||
//
|
||||
// val apiFile = layout.buildDirectory.file(apiFilename)
|
||||
// outputs.file(apiFile)
|
||||
//
|
||||
// doLast {
|
||||
//
|
||||
// ant.invokeMethod(
|
||||
// "get", mapOf(
|
||||
// "src" to target,
|
||||
// "dest" to downloadedFile,
|
||||
// "verbose" to true,
|
||||
// )
|
||||
// )
|
||||
//
|
||||
// val json = downloadedFile.readText()
|
||||
// val prettyJson = JsonOutput.prettyPrint(json)
|
||||
//
|
||||
// apiFile.get().asFile.writeText(prettyJson)
|
||||
//
|
||||
// logger.lifecycle("Downloaded Factorio API json: $apiFile")
|
||||
// }
|
||||
//}
|
||||
|
|
|
|||
34
modules/events-mod/package-lock.json
generated
34
modules/events-mod/package-lock.json
generated
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "kafkatorio-events-mod",
|
||||
"version": "0.5.1",
|
||||
"version": "0.6.0",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
@ -50,19 +50,19 @@
|
|||
"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
|
||||
},
|
||||
"resolve": {
|
||||
"version": "1.22.0",
|
||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
|
||||
"integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
|
||||
"version": "1.22.1",
|
||||
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
|
||||
"integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
|
||||
"requires": {
|
||||
"is-core-module": "^2.8.1",
|
||||
"is-core-module": "^2.9.0",
|
||||
"path-parse": "^1.0.7",
|
||||
"supports-preserve-symlinks-flag": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"source-map": {
|
||||
"version": "0.7.3",
|
||||
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
|
||||
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
|
||||
"version": "0.7.4",
|
||||
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
|
||||
"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
|
||||
},
|
||||
"supports-preserve-symlinks-flag": {
|
||||
"version": "1.0.0",
|
||||
|
|
@ -75,19 +75,19 @@
|
|||
"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
|
||||
},
|
||||
"typed-factorio": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.1.0.tgz",
|
||||
"integrity": "sha512-SiUdkpEDblr0/Ntmj5uNaymC3HIdnw77iDzAsUScT0PZXsEZjDMeRguavhqHsjazYHOYCE/FS4oHoUHS8HMaWA=="
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.2.0.tgz",
|
||||
"integrity": "sha512-6iC5YtJYbR2S12kFujIGzZNhBcQwbaSWIAC7iKbIxh8LhVuIDJoInZOg36DTny5GHDdwi0eSTX/wyCqFAbul0Q=="
|
||||
},
|
||||
"typescript": {
|
||||
"version": "4.6.2",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
|
||||
"integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="
|
||||
"version": "4.7.4",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
|
||||
"integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="
|
||||
},
|
||||
"typescript-to-lua": {
|
||||
"version": "1.4.4",
|
||||
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.4.4.tgz",
|
||||
"integrity": "sha512-HqXDi0rjYANvVeOJlYAyjwCvLtpXV+RRp9GiknCJrd8+0D9G/2yZ5rO+LsDlY1y09sZ4xmufwsiZ6iNFm+o1GQ==",
|
||||
"version": "1.6.0",
|
||||
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.6.0.tgz",
|
||||
"integrity": "sha512-s0MWAMnjl2h0qzf02/iULHCFdv3k4Qvj9gAA7nejjPbeHg+paYJZ/MwOrk7n2+gQkztGhJxCE15J9KIv6oIIIw==",
|
||||
"requires": {
|
||||
"enhanced-resolve": "^5.8.2",
|
||||
"resolve": "^1.15.1",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "kafkatorio-events-mod",
|
||||
"version": "0.5.1",
|
||||
"version": "0.6.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"build": "tstl",
|
||||
|
|
@ -12,9 +12,9 @@
|
|||
"devDependencies": {},
|
||||
"dependencies": {
|
||||
"lua-types": "^2.11.0",
|
||||
"typescript-to-lua": "1.4.4",
|
||||
"typed-factorio": "1.1.0",
|
||||
"typescript": "4.6.2"
|
||||
"typescript-to-lua": "1.6.0",
|
||||
"typed-factorio": "1.2.0",
|
||||
"typescript": "4.7.4"
|
||||
},
|
||||
"license": "UNLICENSED",
|
||||
"peerDependencies": {},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue