From 0398e2026d204ef65b73dbeea7ab5dd696ffa4dc Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Sun, 19 Jun 2022 10:54:37 +0200 Subject: [PATCH] project version bump to 0.6.0, and bump kotest, tstl, typescript --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- modules/events-mod/build.gradle.kts | 93 +++++++++---------- modules/events-mod/package-lock.json | 34 +++---- modules/events-mod/package.json | 8 +- .../kafkatorio/processor/eventProcessor.kt | 6 -- .../processor/tileserver/WebServer.kt | 2 +- .../processor/tileserver/WebsocketServer.kt | 9 +- modules/infra-factorio-server/src/.env | 2 +- modules/infra-kafka-cluster/src/.env | 2 +- modules/infra-kafka-pipe/src/.env | 2 +- 11 files changed, 74 insertions(+), 88 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3be7830..80d7379 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ plugins { } group = "dev.adamko.kafkatorio" -version = "0.5.1" +version = "0.6.0" val licenseFile: RegularFile by extra(layout.projectDirectory.file("LICENSE")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d369186..279301b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -39,7 +39,7 @@ kotkaStreams = "dev-SNAPSHOT" ## test ## junit = "5.8.2" -kotest = "5.3.0" +kotest = "5.3.1" mockk = "1.12.4" ## infra ## diff --git a/modules/events-mod/build.gradle.kts b/modules/events-mod/build.gradle.kts index 56d2a44..0a37eff 100644 --- a/modules/events-mod/build.gradle.kts +++ b/modules/events-mod/build.gradle.kts @@ -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().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") +// } +//} diff --git a/modules/events-mod/package-lock.json b/modules/events-mod/package-lock.json index 443a0a5..7e847ad 100644 --- a/modules/events-mod/package-lock.json +++ b/modules/events-mod/package-lock.json @@ -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", diff --git a/modules/events-mod/package.json b/modules/events-mod/package.json index 00a1cab..be60289 100644 --- a/modules/events-mod/package.json +++ b/modules/events-mod/package.json @@ -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": {}, diff --git a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/eventProcessor.kt b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/eventProcessor.kt index 3eceec0..2515009 100644 --- a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/eventProcessor.kt +++ b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/eventProcessor.kt @@ -50,9 +50,3 @@ suspend fun main() { } } } -// Runtime.getRuntime().addShutdownHook(Thread { -// webServer.stop() -// }) -// launch { -// } -//} diff --git a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/tileserver/WebServer.kt b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/tileserver/WebServer.kt index e3f5f4c..8533849 100644 --- a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/tileserver/WebServer.kt +++ b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/tileserver/WebServer.kt @@ -6,7 +6,7 @@ import org.http4k.server.PolyHandler import org.http4k.server.Undertow import org.http4k.server.asServer -internal suspend fun webServer( +internal fun webServer( tileServer: WebMapTileServer, wsServer: WebsocketServer, appProps: ApplicationProperties, diff --git a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/tileserver/WebsocketServer.kt b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/tileserver/WebsocketServer.kt index 47ca3de..d1ab9b6 100644 --- a/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/tileserver/WebsocketServer.kt +++ b/modules/events-server/src/main/kotlin/dev/adamko/kafkatorio/processor/tileserver/WebsocketServer.kt @@ -98,10 +98,7 @@ class WebsocketServer { val clientJob = SupervisorJob(serverScope.coroutineContext.job) serverScope.launch(CoroutineName("ws-client-$id") + clientJob) { -// return serverScope.launch(CoroutineName("ws-client-$id")) { -// supervisorScope { launch { - suspendCancellableCoroutine { cont -> println("[ws-client] entering suspendCancellableCoroutine") @@ -138,11 +135,7 @@ class WebsocketServer { .onEach { msg -> println("[ws-client] sending message to $id") ws.send(WsMessage(msg)) - } - .launchIn(this) + }.launchIn(this) } - - -// } } } diff --git a/modules/infra-factorio-server/src/.env b/modules/infra-factorio-server/src/.env index 73c834b..c532798 100644 --- a/modules/infra-factorio-server/src/.env +++ b/modules/infra-factorio-server/src/.env @@ -1,4 +1,4 @@ # Do not edit manually. This file was created with task 'dockerEnv' COMPOSE_PROJECT_NAME=kafkatorio FACTORIO_VERSION=1.1.59 -KAFKATORIO_VERSION=0.5.1 +KAFKATORIO_VERSION=0.6.0 diff --git a/modules/infra-kafka-cluster/src/.env b/modules/infra-kafka-cluster/src/.env index 30f6a99..04f99aa 100644 --- a/modules/infra-kafka-cluster/src/.env +++ b/modules/infra-kafka-cluster/src/.env @@ -1,7 +1,7 @@ # Do not edit manually. This file was created with task 'dockerEnv' COMPOSE_PROJECT_NAME=kafkatorio GRAFANA_VERSION=8.5.0 -KAFKATORIO_VERSION=0.5.1 +KAFKATORIO_VERSION=0.6.0 KAFKA_DL_URL=https\://dlcdn.apache.org/kafka/3.2.0/kafka_2.13-3.2.0.tgz KAFKA_VERSION=3.2.0 PROMETHEUS_VERSION=v2.34.0 diff --git a/modules/infra-kafka-pipe/src/.env b/modules/infra-kafka-pipe/src/.env index db082c3..c97ae67 100644 --- a/modules/infra-kafka-pipe/src/.env +++ b/modules/infra-kafka-pipe/src/.env @@ -1,3 +1,3 @@ # Do not edit manually. This file was created with task 'dockerEnv' COMPOSE_PROJECT_NAME=kafkatorio -KAFKATORIO_VERSION=0.5.1 +KAFKATORIO_VERSION=0.6.0