From adf55cb263e35367b9ce503105bafa1f4a7ada38 Mon Sep 17 00:00:00 2001 From: Adam <897017+asemy@users.noreply.github.com> Date: Fri, 10 Dec 2021 20:38:52 +0100 Subject: [PATCH] some version bumps, and renaming --- build.gradle.kts | 2 +- .../infra/docker-compose.gradle.kts | 6 ++--- .../kafkatorio/lang/kotlin-jvm.gradle.kts | 12 +++++----- gradle/libs.versions.toml | 2 +- .../src/main/typescript/package-lock.json | 24 ++++++++----------- .../src/main/typescript/package.json | 11 ++++----- .../infra-factorio-server/build.gradle.kts | 2 +- modules/infra-factorio-server/src/.env | 4 ++-- modules/infra-kafka-cluster/src/.env | 2 +- modules/infra-kafka-pipe/src/.env | 2 +- modules/web-map/build.gradle.kts | 4 +++- 11 files changed, 33 insertions(+), 38 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 582d59f..d162c14 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } group = "dev.adamko.kafkatorio" -version = "0.1.2" +version = "0.1.3" val licenseFile: RegularFile by extra(layout.projectDirectory.file("LICENSE")) diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts index 770e0a4..70a5fad 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/infra/docker-compose.gradle.kts @@ -25,11 +25,11 @@ val dockerDown by tasks.creating(Exec::class) { } afterEvaluate { - tasks.named("processRun") { dependsOn(dockerUp, updateEnv) } + tasks.named("processRun") { dependsOn(dockerUp, dockerEnv) } tasks.named("processKill") { dependsOn(dockerDown) } } -val updateEnv by tasks.registering(WriteProperties::class) { +val dockerEnv by tasks.registering(WriteProperties::class) { group = dockerComposeTaskGroup setOutputFile(srcDir.file(".env")) @@ -38,4 +38,4 @@ val updateEnv by tasks.registering(WriteProperties::class) { ) } -tasks.assemble { dependsOn(updateEnv) } +tasks.assemble { dependsOn(dockerEnv) } diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts index 12e2c81..0bea845 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts @@ -21,23 +21,23 @@ dependencies { // implementation(platform("org.jetbrains.kotlin:kotlin-bom")) - implementation(kotlin("stdlib")) +// implementation(kotlin("stdlib")) // // - val junitVersion = "5.8.1" + val junitVersion = "5.8.2" testImplementation(enforcedPlatform("org.junit:junit-bom:$junitVersion")) testImplementation("org.junit.jupiter:junit-jupiter-api") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") testRuntimeOnly("org.junit.platform:junit-platform-launcher") - val kotestVersion = "4.6.3" + val kotestVersion = "5.0.1" testImplementation(enforcedPlatform("io.kotest:kotest-bom:$kotestVersion")) - testImplementation("io.kotest:kotest-runner-junit5-jvm:$kotestVersion") - testImplementation("io.kotest:kotest-assertions-core-jvm:$kotestVersion") - testImplementation("io.kotest:kotest-property-jvm:$kotestVersion") + testImplementation("io.kotest:kotest-runner-junit5:$kotestVersion") + testImplementation("io.kotest:kotest-assertions-core:$kotestVersion") + testImplementation("io.kotest:kotest-property:$kotestVersion") testImplementation("io.kotest:kotest-assertions-json:$kotestVersion") testImplementation("io.mockk:mockk:1.12.0") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 59d9e3f..6f80bfc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,7 +22,7 @@ junit = "5.8.2" kotest = "5.0.1" ## infra ## -factorio = "1.1.48" +factorio = "1.1.49" ######### [plugins] diff --git a/modules/events-mod/src/main/typescript/package-lock.json b/modules/events-mod/src/main/typescript/package-lock.json index c83bfc6..14b1fa0 100644 --- a/modules/events-mod/src/main/typescript/package-lock.json +++ b/modules/events-mod/src/main/typescript/package-lock.json @@ -1,6 +1,6 @@ { "name": "kafkatorio-events-mod", - "version": "0.1.2", + "version": "0.1.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -74,23 +74,19 @@ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, "typed-factorio": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-0.12.0.tgz", - "integrity": "sha512-7SeZX7TvWjtO+V5buWEgHUbhi7tSNZsHGveh5uPQ6Vvr7BDEhHre9DP3OrdD+L7cpAtvJ2w9OwaMnDm2P5dvng==", - "requires": { - "lua-types": "^2.10.1", - "typescript-to-lua": "^1.0.0" - } + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-0.13.0.tgz", + "integrity": "sha512-a6z8pciAtBQ+FXMJYUI1YqL/zhtFeEW2370rpuxZSaP6RdfWpZ98Vu8Hl19t98h+ULLXnmWsC/g6OW/TJcLbAQ==" }, "typescript": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz", - "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==" + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz", + "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==" }, "typescript-to-lua": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.1.1.tgz", - "integrity": "sha512-13vk/FSQyqbBkXNvg73LpT0tsPKdepJHPYR6TNtbc9l1ClSxAEUvkB3k49MAwSQ6LoN8Ui4Bgyu9dKFoDB315Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.2.0.tgz", + "integrity": "sha512-hbAagI6DgP4MjaPKqGlxtiD/rsZE5hO9ypIz96xukKIjzxp5c/TSItik0BMriX5yIIhRiYLfyAQBp+X1cO8MkQ==", "requires": { "enhanced-resolve": "^5.8.2", "resolve": "^1.15.1", diff --git a/modules/events-mod/src/main/typescript/package.json b/modules/events-mod/src/main/typescript/package.json index 772d947..a1150ee 100644 --- a/modules/events-mod/src/main/typescript/package.json +++ b/modules/events-mod/src/main/typescript/package.json @@ -1,6 +1,6 @@ { "name": "kafkatorio-events-mod", - "version": "0.1.2", + "version": "0.1.3", "private": true, "scripts": { "build": "tstl", @@ -13,12 +13,9 @@ "dependencies": { "lua-types": "^2.11.0", "@types/node": "^12.0.8", - "typescript-to-lua": "1.1.1", - "typed-factorio": "0.12.0", - "typescript": "4.4.4" - }, - "//": { - "typed-factorio": "0.10.0" + "typescript-to-lua": "1.2.0", + "typed-factorio": "0.13.0", + "typescript": "4.5.2" }, "license": "UNLICENSED", "peerDependencies": {}, diff --git a/modules/infra-factorio-server/build.gradle.kts b/modules/infra-factorio-server/build.gradle.kts index 8f113ec..eee876e 100644 --- a/modules/infra-factorio-server/build.gradle.kts +++ b/modules/infra-factorio-server/build.gradle.kts @@ -43,7 +43,7 @@ tasks.dockerUp { ) } -tasks.updateEnv { +tasks.dockerEnv { properties("FACTORIO_VERSION" to libs.versions.factorio.get()) } diff --git a/modules/infra-factorio-server/src/.env b/modules/infra-factorio-server/src/.env index 0f0f4c6..69f81c6 100644 --- a/modules/infra-factorio-server/src/.env +++ b/modules/infra-factorio-server/src/.env @@ -1,3 +1,3 @@ -# Do not edit manually. This file was created with task 'updateEnv' +# Do not edit manually. This file was created with task 'dockerEnv' COMPOSE_PROJECT_NAME=kafkatorio -FACTORIO_VERSION=1.1.48 +FACTORIO_VERSION=1.1.49 diff --git a/modules/infra-kafka-cluster/src/.env b/modules/infra-kafka-cluster/src/.env index 811559f..6f7d99f 100644 --- a/modules/infra-kafka-cluster/src/.env +++ b/modules/infra-kafka-cluster/src/.env @@ -1,2 +1,2 @@ -# Do not edit manually. This file was created with task 'updateEnv' +# Do not edit manually. This file was created with task 'dockerEnv' COMPOSE_PROJECT_NAME=kafkatorio diff --git a/modules/infra-kafka-pipe/src/.env b/modules/infra-kafka-pipe/src/.env index 811559f..6f7d99f 100644 --- a/modules/infra-kafka-pipe/src/.env +++ b/modules/infra-kafka-pipe/src/.env @@ -1,2 +1,2 @@ -# Do not edit manually. This file was created with task 'updateEnv' +# Do not edit manually. This file was created with task 'dockerEnv' COMPOSE_PROJECT_NAME=kafkatorio diff --git a/modules/web-map/build.gradle.kts b/modules/web-map/build.gradle.kts index 855e89d..5fd09db 100644 --- a/modules/web-map/build.gradle.kts +++ b/modules/web-map/build.gradle.kts @@ -52,12 +52,14 @@ kotlin { implementation("io.kvision:kvision-state:$kvisionVersion") implementation("io.kvision:kvision-chart:$kvisionVersion") - val kotlinWrappersVersion = "0.0.1-pre.270-kotlin-1.6.0" + val kotlinWrappersVersion = "0.0.1-pre.276-kotlin-1.6.0" implementation( project.dependencies.enforcedPlatform( "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${kotlinWrappersVersion}" ) ) + + implementation(npm("kafkajs", "1.15.0")) } val webDir = file("src/main/web")