From 5a304245f1aa27e5a7c0ef868db88cc43c76c618 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Wed, 6 Jul 2022 16:20:11 +0200 Subject: [PATCH] bump kvision, js wrappers. organise dependencies --- gradle/kotlin-js-store/yarn.lock | 42 +++++++-------- gradle/libs.versions.toml | 59 ++++++++-------------- modules/events-library/build.gradle.kts | 8 +-- modules/versions-platform/build.gradle.kts | 14 +++-- 4 files changed, 55 insertions(+), 68 deletions(-) diff --git a/gradle/kotlin-js-store/yarn.lock b/gradle/kotlin-js-store/yarn.lock index bc40042..6b8baf8 100644 --- a/gradle/kotlin-js-store/yarn.lock +++ b/gradle/kotlin-js-store/yarn.lock @@ -551,10 +551,10 @@ bonjour-service@^1.0.11: fast-deep-equal "^3.1.3" multicast-dns "^7.2.5" -bootstrap-icons@^1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/bootstrap-icons/-/bootstrap-icons-1.8.1.tgz#773c1625bcbf3e86090ea9da4386c2c6459c5582" - integrity sha512-IXUqislddPJfwq6H+2nTkHyr9epO9h6u1AG0OZCx616w+TgzeoCjfmI3qJMQqt1J586gN2IxzB4M99Ip4sTZ1w== +bootstrap-icons@^1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/bootstrap-icons/-/bootstrap-icons-1.8.3.tgz#14c15e26deaddd42af9f88c4d81f7c45bf26aa98" + integrity sha512-s5kmttnbq4BXbx3Bwnj39y+t7Vc3blTtyD77W3aYQ1LlNoS3lNbbGvSYhIbg26Im8KmjScyFpHEevlPOBcIDdA== bootstrap@^5.1.3: version "5.1.3" @@ -771,10 +771,10 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -connect-history-api-fallback@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" - integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== +connect-history-api-fallback@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" + integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== connect@^3.7.0: version "3.7.0" @@ -1795,10 +1795,10 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -kvision-assets@^5.0.8: - version "5.0.8" - resolved "https://registry.yarnpkg.com/kvision-assets/-/kvision-assets-5.0.8.tgz#f2220135a94b1330cb2ac8f1804b53f40a9bd711" - integrity sha512-umq47D8z2W7cTYR/6RtJ+048mlsi5X515tcM/PFgDcbaI82Pd9EHv2m9520SxmBH6AD04GTweWNyUcKlPx9oZQ== +kvision-assets@^5.0.9: + version "5.0.9" + resolved "https://registry.yarnpkg.com/kvision-assets/-/kvision-assets-5.0.9.tgz#6f305e4c085a4eab57897f6741c208121e9b035c" + integrity sha512-pMbKmlGbc6FYtJVPbH6oKXWFOp6O6Uljhi6KODs4AGuIiqZxhjXKXwMEhaaLzheuP5/bu0hNYWa4LGSwcvIOJQ== leaflet@^1.8.0: version "1.8.0" @@ -2544,10 +2544,10 @@ signal-exit@^3.0.3: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== -snabbdom@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.5.0.tgz#e75acbdedb26ea327c75028a433ba064db0ccf6e" - integrity sha512-Ff5BKG18KrrPuskHJlA9aujPHqEabItaDl96l7ZZndF4zt5AYSczz7ZjjgQAX5IBd5cd25lw9NfgX21yVUJ+9g== +snabbdom@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.5.1.tgz#25f80ef15b194baea703d9d5441892e369de18e1" + integrity sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA== socket.io-adapter@~2.4.0: version "2.4.0" @@ -2908,10 +2908,10 @@ webpack-dev-middleware@^5.3.1: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@4.9.2: - version "4.9.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz#c188db28c7bff12f87deda2a5595679ebbc3c9bc" - integrity sha512-H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q== +webpack-dev-server@4.9.3: + version "4.9.3" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.3.tgz#2360a5d6d532acb5410a668417ad549ee3b8a3c9" + integrity sha512-3qp/eoboZG5/6QgiZ3llN8TUzkSpYg1Ko9khWX1h40MIEUNS2mDoIa8aXsPfskER+GbTvs/IJZ1QTBBhhuetSw== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" @@ -2925,7 +2925,7 @@ webpack-dev-server@4.9.2: chokidar "^3.5.3" colorette "^2.0.10" compression "^1.7.4" - connect-history-api-fallback "^1.6.0" + connect-history-api-fallback "^2.0.0" default-gateway "^6.0.3" express "^4.17.3" graceful-fs "^4.2.6" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a4a42ab..fa2fbf6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,20 +12,20 @@ kotlin = "1.7.0" camel-kafkaConnectors = "0.11.0" http4k = "4.25.16.2" kafka = "3.2.0" -kvision = "5.11.0" +kvision = "5.12.0" log4j2 = "2.17.2" -qosLogback = "1.2.11" -slf4j = "1.7.36" okio = "3.2.0" +qosLogback = "1.2.11" scrimage = "4.0.31" semver = "1.2.0" +slf4j = "1.7.36" kotlinx-serialization = "1.3.3" kxs-charleskornKaml = "0.44.0" kxs-mamoeYamlkt = "0.12.0" kxs-kxsTsGen = "0.2.1" -kotlinJsWrappers = "1.0.0-pre.349" # https://search.maven.org/artifact/org.jetbrains.kotlin-wrappers/kotlin-wrappers-bom +kotlinJsWrappers = "1.0.0-pre.351" # https://search.maven.org/artifact/org.jetbrains.kotlin-wrappers/kotlin-wrappers-bom kotlinx-cli = "0.3.4" kotlinx-coroutines = "1.6.3" @@ -41,6 +41,7 @@ simpleSyslogParser = "0.0.6" kotkaStreams = "dev-SNAPSHOT" +marykRocksDb = "7.3.1" # https://search.maven.org/artifact/io.maryk.rocksdb/rocksdb-multiplatform ## test ## junit = "5.8.2" @@ -204,7 +205,7 @@ kafka-streamsTestUtils = { group = "org.apache.kafka", name = "kafka-streams-tes kafka-kotkaStreams = { group = "dev.adamko.kotka", name = "kotka-streams", version.ref = "kotkaStreams" } -rocksdb = { group = "io.maryk.rocksdb", name = "rocksdb-multiplatform", version = "7.0.3" } +mary-rocksdb = { group = "io.maryk.rocksdb", name = "rocksdb-multiplatform", version.ref = "marykRocksDb" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.14.3" } skrapeit = { group = "it.skrape", name = "skrapeit", version = "1.2.0" } @@ -239,12 +240,13 @@ junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine" junit-launcher = { group = "org.junit.platform", name = "junit-platform-launcher" } # version = "1.7.2" } ## kotest ## -kotest-bom = { group = "io.kotest", name = "kotest-bom", version.ref = "kotest" } -kotest-core = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest" } -kotest-datatest = { group = "io.kotest", name = "kotest-framework-datatest", version.ref = "kotest" } -kotest-runner = { group = "io.kotest", name = "kotest-runner-junit5", version.ref = "kotest" } -kotest-prop = { group = "io.kotest", name = "kotest-property", version.ref = "kotest" } -kotest-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotest" } +kotest-bom = { group = "io.kotest", name = "kotest-bom", version.ref = "kotest" } +kotest-core = { group = "io.kotest", name = "kotest-assertions-core" } +kotest-datatest = { group = "io.kotest", name = "kotest-framework-datatest" } +kotest-json = { group = "io.kotest", name = "kotest-assertions-json" } +kotest-prop = { group = "io.kotest", name = "kotest-property" } +kotest-frameworkEngine = { group = "io.kotest", name = "kotest-framework-engine" } +kotest-runnerJunit5 = { group = "io.kotest", name = "kotest-runner-junit5" } ## http4k ## http4k-test-chaos = { group = "org.http4k", name = "http4k-testing-chaos", version.ref = "http4k" } @@ -264,39 +266,20 @@ logging = [ "logback-encoder", ] -kt-testing = [ - "kotest-core", - "kotest-datatest", - "kotest-runner", - "kotest-prop", - "kotest-json", - "mockk", -] +#kt-testing = [ +# "kotest-core", +# "kotest-datatest", +# "kotest-runner", +# "kotest-prop", +# "kotest-json", +# "mockk", +#] junit-runtime = [ "junit-engine", "junit-launcher", ] -http4k = [ - "http4k-core", - "http4k-contract", - "http4k-client-okhttp", - "http4k-client-ws", - "http4k-server", - "http4k-cloudnative", -# "http4k-format-jackson-xml", -# "http4k-format-jackson-json", -# "http4k-format-jackson-yaml", - "http4k-format-kotlinx", -] - -http4k-test = [ - "http4k-test-chaos", - "http4k-test-approval", - "http4k-test-kotest", -] - kotlinScripting-def = [ "kotlinScripting-common", "kotlinScripting-jvm", diff --git a/modules/events-library/build.gradle.kts b/modules/events-library/build.gradle.kts index b99515a..bd304c5 100644 --- a/modules/events-library/build.gradle.kts +++ b/modules/events-library/build.gradle.kts @@ -71,11 +71,11 @@ kotlin { implementation(kotlin("test")) implementation(project.dependencies.platform(libs.kotest.bom)) - implementation("io.kotest:kotest-framework-engine") implementation(libs.kotest.core) implementation(libs.kotest.datatest) - implementation(libs.kotest.prop) + implementation(libs.kotest.frameworkEngine) implementation(libs.kotest.json) + implementation(libs.kotest.prop) } } @@ -87,13 +87,13 @@ kotlin { val jvmTest by getting { dependencies { - implementation("io.kotest:kotest-runner-junit5") + implementation(libs.kotest.runnerJunit5) } } val jsTest by getting { dependencies { - implementation(kotlin("test-js")) +// implementation(kotlin("test-js")) } } } diff --git a/modules/versions-platform/build.gradle.kts b/modules/versions-platform/build.gradle.kts index 593c4b9..54222d2 100644 --- a/modules/versions-platform/build.gradle.kts +++ b/modules/versions-platform/build.gradle.kts @@ -22,15 +22,19 @@ dependencies { api(platform(libs.kotest.bom)) constraints { - api(libs.skrapeit) - api(libs.kxs.charleskornKaml) - api(libs.kxs.mamoeYamlkt) api(libs.kafka.kotkaStreams) api(libs.kafka.streams) - api(libs.okio.core) - api(libs.scrimage.core) api(libs.kafka.streamsTestUtils) + api(libs.kxs.charleskornKaml) + api(libs.kxs.mamoeYamlkt) + + api(libs.okio.core) + + api(libs.scrimage.core) + + api(libs.skrapeit) + api(libs.mockk) } }