diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 571733a..59514df 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -7,50 +7,35 @@ plugins { `project-report` } - -object Versions { - const val jvmTarget = "11" - const val kotlinTarget = "1.6" - - const val kotlin = "1.6.21" - - const val gradleNodePlugin = "3.2.1" - const val gradleDockerComposePlugin = "0.15.2" - - const val kotlinXSerialization = "1.3.2" - const val kvision = "5.8.2" - const val semver = "1.1.2" - const val http4k = "4.19.1.0" - - const val kotest = "5.2.3" -} +val gradleJvmTarget = "11" +val gradleKotlinTarget = "1.6" dependencies { - implementation(enforcedPlatform("org.jetbrains.kotlin:kotlin-bom:${Versions.kotlin}")) + implementation(enforcedPlatform("org.jetbrains.kotlin:kotlin-bom:${libs.versions.kotlin.get()}")) implementation("org.jetbrains.kotlin:kotlin-serialization") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable") - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}") - implementation(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:${Versions.kotlinXSerialization}")) + implementation(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:${libs.versions.kotlinx.serialization.get()}")) implementation("org.jetbrains.kotlinx:kotlinx-serialization-core") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json") // implementation("com.charleskorn.kaml:kaml:0.37.0") - implementation("com.github.node-gradle:gradle-node-plugin:${Versions.gradleNodePlugin}") + implementation("com.github.node-gradle:gradle-node-plugin:${libs.versions.gradleNodePlugin.get()}") - implementation("io.kotest:kotest-framework-multiplatform-plugin-gradle:${Versions.kotest}") + implementation("io.kotest:kotest-framework-multiplatform-plugin-gradle:${libs.versions.kotest.get()}") - implementation("io.kvision:io.kvision.gradle.plugin:${Versions.kvision}") + implementation("io.kvision:io.kvision.gradle.plugin:${libs.versions.kvision.get()}") - implementation("net.swiftzer.semver:semver:${Versions.semver}") + implementation("net.swiftzer.semver:semver:${libs.versions.semver.get()}") // https://github.com/avast/gradle-docker-compose-plugin - implementation("com.avast.gradle:gradle-docker-compose-plugin:${Versions.gradleDockerComposePlugin}") +// implementation("com.avast.gradle:gradle-docker-compose-plugin:${Versions.gradleDockerComposePlugin}") - implementation(platform("org.http4k:http4k-bom:${Versions.http4k}")) + implementation(platform("org.http4k:http4k-bom:${libs.versions.http4k.get()}")) implementation("org.http4k:http4k-core") implementation("org.http4k:http4k-client-okhttp") @@ -68,12 +53,12 @@ dependencies { // } //} -tasks.withType().all { +tasks.withType().configureEach { kotlinOptions { - jvmTarget = Versions.jvmTarget - apiVersion = Versions.kotlinTarget - languageVersion = Versions.kotlinTarget + jvmTarget = gradleJvmTarget + apiVersion = gradleKotlinTarget + languageVersion = gradleKotlinTarget } kotlinOptions.freeCompilerArgs += listOf( @@ -88,11 +73,11 @@ tasks.withType().all { kotlin { jvmToolchain { - (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(Versions.jvmTarget)) + (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(gradleJvmTarget)) } kotlinDslPluginOptions { - jvmTarget.set(Versions.jvmTarget) + jvmTarget.set(gradleJvmTarget) } } @@ -102,10 +87,3 @@ idea { isDownloadJavadoc = true } } - -// projects must be configuring hack - - -tasks.configureEach { - inputs.property("pRoJeCtS-mUsT-bE-cOnFiGuRiNg", System.currentTimeMillis()) -} diff --git a/gradle/kotlin-js-store/yarn.lock b/gradle/kotlin-js-store/yarn.lock index b774c5d..cd65097 100644 --- a/gradle/kotlin-js-store/yarn.lock +++ b/gradle/kotlin-js-store/yarn.lock @@ -109,7 +109,7 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== -"@types/geojson@*", "@types/geojson@7946.0.8": +"@types/geojson@7946.0.8": version "7946.0.8" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== @@ -134,13 +134,6 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== -"@types/leaflet@^1.7.7": - version "1.7.9" - resolved "https://registry.yarnpkg.com/@types/leaflet/-/leaflet-1.7.9.tgz#7993d34f14cfa88c45b3d490daba39a3a1be9a2b" - integrity sha512-H8vPgD49HKzqM41ArHGZM70g/tfhp8W+JcPxfnF+5H/Xvp+xiP+KQOUNWU8U89fqS1Jj3cpRY/+nbnaHFzwnFA== - dependencies: - "@types/geojson" "*" - "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -446,7 +439,7 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -async@^2.6.2, async@^2.6.4: +async@^2.6.2: version "2.6.4" resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== @@ -1037,11 +1030,6 @@ electron-to-chromium@^1.4.84: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.114.tgz#d85ec0808dd50b0cf6e6b262480ffd385f71c873" integrity sha512-gRwLpVYWHGbERPU6o8pKfR168V6enWEXzZc6zQNNXbgJ7UJna+9qzAIHY94+9KOv71D/CH+QebLA9pChD2q8zA== -element-resize-event@^3.0.6: - version "3.0.6" - resolved "https://registry.yarnpkg.com/element-resize-event/-/element-resize-event-3.0.6.tgz#3a18efd4879ad615e979fd8bbf173b014987eb9a" - integrity sha512-sSeXY9rNDp86bJODW68pxLcy3A5FrPZfIgOrJHzqgYzX513Zq6/ytdBigp7KeJEpZZopBBSiO1cVuiRkZpNxLw== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -1258,7 +1246,7 @@ faye-websocket@^0.11.3: dependencies: websocket-driver ">=0.5.1" -fecha@^4.2.1: +fecha@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== @@ -1314,11 +1302,6 @@ follow-redirects@^1.0.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== -follow-redirects@^1.14.8: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== - format-util@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271" @@ -2000,7 +1983,7 @@ kvision-assets@^5.0.8: resolved "https://registry.yarnpkg.com/kvision-assets/-/kvision-assets-5.0.8.tgz#f2220135a94b1330cb2ac8f1804b53f40a9bd711" integrity sha512-umq47D8z2W7cTYR/6RtJ+048mlsi5X515tcM/PFgDcbaI82Pd9EHv2m9520SxmBH6AD04GTweWNyUcKlPx9oZQ== -leaflet@^1.7.1: +leaflet@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.8.0.tgz#4615db4a22a304e8e692cae9270b983b38a2055e" integrity sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA== @@ -2216,7 +2199,7 @@ nanoid@3.1.25: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== -nanoid@^3.1.31, nanoid@^3.3.1: +nanoid@^3.3.1: version "3.3.3" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== @@ -2236,11 +2219,6 @@ node-forge@^0.10.0: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-forge@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" - integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== - node-releases@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.3.tgz#225ee7488e4a5e636da8da52854844f9d716ca96" @@ -2875,10 +2853,10 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -snabbdom@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.4.0.tgz#c76ed02643729f84a63875b7894a0fbcdc95c710" - integrity sha512-Sr5H1l5QxJa0B/68ZtpWi7MuGIzLWS2Up64QqXe/wzvWOjXvM9rL7+C8GhMmDVtJ7dFWypvyWJHR3nmeZN8YIQ== +snabbdom@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.5.0.tgz#e75acbdedb26ea327c75028a433ba064db0ccf6e" + integrity sha512-Ff5BKG18KrrPuskHJlA9aujPHqEabItaDl96l7ZZndF4zt5AYSczz7ZjjgQAX5IBd5cd25lw9NfgX21yVUJ+9g== socket.io-adapter@~2.1.0: version "2.1.0" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e8d0aab..47bba69 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,18 +12,18 @@ kotlin = "1.6.21" camel-kafkaConnectors = "0.11.0" http4k = "4.25.12.0" kafka = "3.1.0" -kvision = "5.9.0" +kvision = "5.10.0" log4j2 = "2.17.2" qosLogback = "1.2.11" slf4j = "1.7.36" okio = "3.1.0" scrimage = "4.0.31" +semver = "1.2.0" -kotlinx-serialization = "1.3.2" +kotlinx-serialization = "1.3.3" kxs-yaml = "0.43.0" -#kotlinJsWrappers = "0.0.1-pre.331-kotlin-1.6.20" -kotlinJsWrappers = "0.0.1-pre.334" +kotlinJsWrappers = "0.0.1-pre.334" kotlinx-html = "0.7.5" kotlinx-nodejs = "0.0.7" kotlinx-coroutines = "1.6.1" @@ -34,13 +34,17 @@ ktor = "2.0.1" ## test ## junit = "5.8.2" kotest = "5.3.0" +mockk = "1.12.4" ## infra ## -factorio = "1.1.57" +factorio = "1.1.59" confluent-kafkaConnect = "7.0.1" grafana = "8.5.0" prometheus = "v2.34.0" +## gradle plugins ## +gradleNodePlugin = "3.2.1" + ######### [plugins] ######### @@ -50,8 +54,8 @@ kotlinJs = { id = "org.jetbrains.kotlin.js", vers kotlinSerialization = { id = "org.jetbrains.kotlin.kotlin-serialization", version.ref = "kotlin" } loggingCapabilities = { id = "dev.jacomet.logging-capabilities", version = "0.10.0" } -shadowJar = { id = "com.github.jengelman.gradle.plugins.shadow", version = "6.1.0" } -dependencyCheck = { id = "com.github.ben-manes.versions", version = "0.39.0" } +#shadowJar = { id = "com.github.jengelman.gradle.plugins.shadow", version = "6.1.0" } +#dependencyCheck = { id = "com.github.ben-manes.versions", version = "0.39.0" } ########### @@ -135,7 +139,7 @@ okio-core = { group = "com.squareup.okio", name = "okio" } ### test ### ############# -mockk = { group = "io.mockk", name = "mockk", version = "1.12.3" } +mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" } ## junit ## junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" } diff --git a/modules/events-mod/src/main/typescript/package-lock.json b/modules/events-mod/src/main/typescript/package-lock.json index 876ae00..5237b02 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.4.0", + "version": "0.5.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -75,14 +75,14 @@ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, "typed-factorio": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.0.0.tgz", - "integrity": "sha512-8JYdjizJKMUhEpaZ7SoVLQ+toe0XTebK/Zh/Iwwvs29x8Ml758XACX5Bn71LJK22u3obgu7YN2yn2GxZbQ554g==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.1.0.tgz", + "integrity": "sha512-SiUdkpEDblr0/Ntmj5uNaymC3HIdnw77iDzAsUScT0PZXsEZjDMeRguavhqHsjazYHOYCE/FS4oHoUHS8HMaWA==" }, "typescript": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", - "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==" + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz", + "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==" }, "typescript-to-lua": { "version": "1.4.4", diff --git a/modules/events-mod/src/main/typescript/package.json b/modules/events-mod/src/main/typescript/package.json index 76c3ef4..861f812 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.4.0", + "version": "0.5.0", "private": true, "scripts": { "build": "tstl", @@ -14,8 +14,8 @@ "dependencies": { "lua-types": "^2.11.0", "typescript-to-lua": "1.4.4", - "typed-factorio": "1.0.0", - "typescript": "4.6.3" + "typed-factorio": "1.1.0", + "typescript": "4.6.2" }, "license": "UNLICENSED", "peerDependencies": {