From bc7a64af4065a3b9a53e3579f695631f900528df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:43:54 +0000 Subject: [PATCH 1/6] Bump kotlinx-json from 1.6.0 to 1.6.1 Bumps `kotlinx-json` from 1.6.0 to 1.6.1. Updates `org.jetbrains.kotlinx:kotlinx-serialization-json` from 1.6.0 to 1.6.1 - [Release notes](https://github.com/Kotlin/kotlinx.serialization/releases) - [Changelog](https://github.com/Kotlin/kotlinx.serialization/blob/master/CHANGELOG.md) - [Commits](https://github.com/Kotlin/kotlinx.serialization/compare/v1.6.0...v1.6.1) Updates `org.jetbrains.kotlinx:kotlinx-serialization-hocon` from 1.6.0 to 1.6.1 - [Release notes](https://github.com/Kotlin/kotlinx.serialization/releases) - [Changelog](https://github.com/Kotlin/kotlinx.serialization/blob/master/CHANGELOG.md) - [Commits](https://github.com/Kotlin/kotlinx.serialization/compare/v1.6.0...v1.6.1) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-serialization-json dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlinx:kotlinx-serialization-hocon dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 505af8655..050bc4dc2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ arrow = "1.2.1" arrowGradle = "0.12.0-rc.6" exposed = "0.44.1" kotlin = "1.9.10" -kotlinx-json = "1.6.0" +kotlinx-json = "1.6.1" kotlinx-datetime = "0.4.1" ktor = "2.3.6" spotless = "6.22.0" From a34870299e05408020e3aafe47bd5d0cc0566cf7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 16:43:37 +0000 Subject: [PATCH 2/6] Bump kotlin from 1.9.10 to 1.9.20 Bumps `kotlin` from 1.9.10 to 1.9.20. Updates `org.jetbrains.kotlin.multiplatform` from 1.9.10 to 1.9.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.10...v1.9.20) Updates `org.jetbrains.kotlin.jvm` from 1.9.10 to 1.9.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.10...v1.9.20) Updates `org.jetbrains.kotlin.js` from 1.9.10 to 1.9.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.10...v1.9.20) Updates `org.jetbrains.kotlin.plugin.serialization` from 1.9.10 to 1.9.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.10...v1.9.20) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.multiplatform dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin.js dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 050bc4dc2..e0e0234bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ arrow = "1.2.1" arrowGradle = "0.12.0-rc.6" exposed = "0.44.1" -kotlin = "1.9.10" +kotlin = "1.9.20" kotlinx-json = "1.6.1" kotlinx-datetime = "0.4.1" ktor = "2.3.6" From 2b11cb7fa58eeaf243c5d1f9986267ed5ce5c3fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 15:18:51 +0000 Subject: [PATCH 3/6] Bump app.softwork:kotlinx-uuid-core from 0.0.21 to 0.0.22 Bumps [app.softwork:kotlinx-uuid-core](https://github.com/hfhbd/kotlinx-uuid) from 0.0.21 to 0.0.22. - [Release notes](https://github.com/hfhbd/kotlinx-uuid/releases) - [Commits](https://github.com/hfhbd/kotlinx-uuid/compare/v0.0.21...v0.0.22) --- updated-dependencies: - dependency-name: app.softwork:kotlinx-uuid-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e0e0234bd..60cd29f9d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ kotest = "5.8.0" kotest-testcontainers = "2.0.2" kotest-arrow = "1.4.0" klogging = "5.1.0" -uuid = "0.0.21" +uuid = "0.0.22" postgresql = "42.6.0" testcontainers = "1.19.1" hikari = "5.0.1" From d25f8415f05bf433821abae8555e8113139507ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:28:13 +0100 Subject: [PATCH 4/6] Migrates some kotest to kotlin.test --- gradle/libs.versions.toml | 1 - tokenizer/build.gradle.kts | 3 -- .../tokenizer/ImmutableByteArrayTest.kt | 31 ++++++++++++------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60cd29f9d..d29c0bd2f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -83,7 +83,6 @@ kotest-framework = { module = "io.kotest:kotest-framework-engine", version.ref = kotest-property = { module = "io.kotest:kotest-property", version.ref = "kotest" } kotest-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" } kotest-testcontainers = { module = "io.kotest.extensions:kotest-extensions-testcontainers", version.ref = "kotest-testcontainers" } -kotest-assertions-arrow = { module = "io.kotest.extensions:kotest-assertions-arrow", version.ref = "kotest-arrow" } ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } diff --git a/tokenizer/build.gradle.kts b/tokenizer/build.gradle.kts index 3e117e2de..8ec5c5add 100644 --- a/tokenizer/build.gradle.kts +++ b/tokenizer/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.kotlin.multiplatform) - alias(libs.plugins.kotest.multiplatform) alias(libs.plugins.spotless) alias(libs.plugins.arrow.gradle.publish) alias(libs.plugins.semver.gradle) @@ -41,12 +40,10 @@ kotlin { dependencies { implementation(kotlin("test")) implementation(libs.kotest.property) - implementation(libs.kotest.framework) implementation(libs.kotest.assertions) implementation("com.goncalossilva:resources:0.3.2") } } - val jvmTest by getting { dependencies { implementation(libs.kotest.junit5) } } js { nodejs { testTask { useMocha { timeout = "10000" } } } browser { testTask { useMocha { timeout = "10000" } } } diff --git a/tokenizer/src/commonTest/kotlin/com/xebia/functional/tokenizer/ImmutableByteArrayTest.kt b/tokenizer/src/commonTest/kotlin/com/xebia/functional/tokenizer/ImmutableByteArrayTest.kt index 5b72fdae8..933bd1a12 100644 --- a/tokenizer/src/commonTest/kotlin/com/xebia/functional/tokenizer/ImmutableByteArrayTest.kt +++ b/tokenizer/src/commonTest/kotlin/com/xebia/functional/tokenizer/ImmutableByteArrayTest.kt @@ -1,12 +1,13 @@ package com.xebia.functional.tokenizer import io.kotest.assertions.throwables.shouldThrow -import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe +import kotlin.test.Test -class ImmutableByteArrayTest : StringSpec({ - "can be used as key in map" { +class ImmutableByteArrayTest { + @Test + fun canBeUsedAsKeyInMap() { val key1 = ImmutableByteArray.from("1, 2, 3") val key2 = ImmutableByteArray.from("1, 2, 3") @@ -14,7 +15,9 @@ class ImmutableByteArrayTest : StringSpec({ key1.hashCode() shouldBe key2.hashCode() } - "cannot be mutated when using ByteArray constructor" { + + @Test + fun cannotBeMutatedWhenUsingByteArrayConstructor() { val bytes = byteArrayOf(1, 2, 3) val byteArray = ImmutableByteArray.from(bytes) @@ -24,7 +27,8 @@ class ImmutableByteArrayTest : StringSpec({ byteArray shouldBe ImmutableByteArray.from(byteArrayOf(1, 2, 3)) } - "cannot be mutated when using rawArray" { + @Test + fun cannotBeMutatedWhenUsingRawArray() { val byteArray = ImmutableByteArray.from("1, 2, 3") val bytes = byteArray.rawArray @@ -34,35 +38,40 @@ class ImmutableByteArrayTest : StringSpec({ byteArray shouldBe ImmutableByteArray.from("1, 2, 3") } - "getLength is correct" { + @Test + fun getLengthIsCorrect() { val byteArray = ImmutableByteArray.from("1, 2, 3") byteArray.size shouldBe 7 } - "getBytesBetween returns correct slice of array" { + @Test + fun getBytesBetweenReturnsCorrectSliceOfArray() { val byteArray = ImmutableByteArray.from(byteArrayOf(1, 2, 3, 4, 5, 6)) byteArray.getBytesBetween(3, 6) shouldBe ImmutableByteArray.from(byteArrayOf(4, 5, 6)) } - "getBytesBetween throws when inclusive startIndex is out of bounds" { + @Test + fun getBytesBetweenThrowsWhenInclusiveStartIndexIsOutOfBounds() { val byteArray = ImmutableByteArray.from(byteArrayOf(1, 2, 3, 4, 5, 6)) shouldThrow { byteArray.getBytesBetween(-1, 6) } shouldThrow { byteArray.getBytesBetween(9, 10) } } - "getBytesBetween throws when exclusive endIndex is out of bounds" { + @Test + fun getBytesBetweenThrowsWhenExclusiveEndIndexIsOutOfBounds() { val byteArray = ImmutableByteArray.from(byteArrayOf(1, 2, 3, 4, 5, 6)) shouldThrow { byteArray.getBytesBetween(0, 7) } shouldThrow { byteArray.getBytesBetween(0, -1) } } - "getBytesBetween throws when startIndex is greater than endIndex" { + @Test + fun getBytesBetweenThrowsWhenStartIndexIsGreaterThanEndIndex() { val byteArray = ImmutableByteArray.from(byteArrayOf(1, 2, 3, 4, 5, 6)) shouldThrow { byteArray.getBytesBetween(3, 2) } } -}) +} From d45752711a2cfeba8c85b0141a15d6956ed4af21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 15:21:21 +0000 Subject: [PATCH 5/6] Bump org.postgresql:postgresql from 42.6.0 to 42.7.0 Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.0 to 42.7.0. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.6.0...REL42.7.0) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 505af8655..1ab8441f5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ kotest-testcontainers = "2.0.2" kotest-arrow = "1.4.0" klogging = "5.1.0" uuid = "0.0.21" -postgresql = "42.6.0" +postgresql = "42.7.0" testcontainers = "1.19.1" hikari = "5.0.1" dokka = "1.9.10" From 79c9e3e1e0bdeb78ac534bbdd1d366217f30f5bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 15:21:24 +0000 Subject: [PATCH 6/6] Bump com.fasterxml.jackson.core:jackson-databind from 2.15.3 to 2.16.0 Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.15.3 to 2.16.0. - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 505af8655..887a1fd45 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,7 @@ pdfbox = "3.0.0" mysql = "8.0.33" semverGradle = "0.5.0-rc.5" openai-client-version = "3.5.1" -jackson = "2.15.3" +jackson = "2.16.0" jsonschema = "4.32.0" jakarta = "3.0.2" suspend-transform = "0.5.1"