Skip to content

Commit

Permalink
Bump Kotlin version and library dependencies
Browse files Browse the repository at this point in the history
Encounter 2 issue:
- Duration Serializer serial Name seems to now exist maybe linked to this : Kotlin/kotlinx.serialization#1472 (comment)
- In TaskTagEngineTests of coroutines sequence I added a clear of mock due to this issue: mockk/mockk#821
but still one failing without understanding
  • Loading branch information
Ouriel committed Aug 26, 2022
1 parent 62c4dce commit a5da397
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
20 changes: 10 additions & 10 deletions buildSrc/src/main/kotlin/Libs.kt
Original file line number Diff line number Diff line change
Expand Up @@ -32,53 +32,53 @@ object Libs {
}

object Coroutines {
private const val version = "1.6.1"
private const val version = "1.6.4"
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
const val jdk8 = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$version"
}

object Caffeine {
const val caffeine = "com.github.ben-manes.caffeine:caffeine:3.0.6"
const val caffeine = "com.github.ben-manes.caffeine:caffeine:3.1.1"
}

object Serialization {
const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0"
}

object JsonPath {
const val jayway = "com.jayway.jsonpath:json-path:2.7.0"
}

object Jackson {
private const val version = "2.13.2"
private const val version = "2.13.3"
const val core = "com.fasterxml.jackson.core:jackson-core:$version"
const val databind = "com.fasterxml.jackson.core:jackson-databind:$version"
const val kotlin = "com.fasterxml.jackson.module:jackson-module-kotlin:$version"
const val jsr310 = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$version"
}

object Kotest {
private const val version = "5.2.3"
private const val version = "5.4.2"
const val property = "io.kotest:kotest-property-jvm:$version"
const val junit5 = "io.kotest:kotest-runner-junit5-jvm:$version"
}

object Mockk {
const val mockk = "io.mockk:mockk:1.12.3"
const val mockk = "io.mockk:mockk:1.12.7"
}

object Avro4k {
const val core = "com.github.avro-kotlin.avro4k:avro4k-core:1.6.0"
}

object Hoplite {
private const val version = "2.1.2"
private const val version = "2.6.1"
const val core = "com.sksamuel.hoplite:hoplite-core:$version"
const val yaml = "com.sksamuel.hoplite:hoplite-yaml:$version"
}

object Pulsar {
private const val version = "2.10.0"
private const val version = "2.10.1"
const val client = "org.apache.pulsar:pulsar-client:$version"
const val clientAdmin = "org.apache.pulsar:pulsar-client-admin:$version"
const val functions = "org.apache.pulsar:pulsar-functions-api:$version"
Expand All @@ -87,7 +87,7 @@ object Libs {
}

object Kweb {
const val core = "com.github.kwebio:kweb-core:0.11.2"
const val core = "com.github.kwebio:kweb-core:0.11.5"
}

object EasyRandom {
Expand All @@ -101,6 +101,6 @@ object Libs {
}

object Logging {
const val api = "io.github.microutils:kotlin-logging:2.1.21"
const val api = "io.github.microutils:kotlin-logging:2.1.23"
}
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Plugins.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* Licensor: infinitic.io
*/

const val kotlinVersion = "1.6.21"
const val kotlinVersion = "1.7.10"

object Plugins {
object Kotlin {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import kotlinx.serialization.encoding.Encoder
import java.time.Duration

object DurationSerializer : KSerializer<Duration> {
override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("Duration", PrimitiveKind.LONG)
override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("DurationLong", PrimitiveKind.LONG)
override fun serialize(encoder: Encoder, value: Duration) { encoder.encodeLong(value.toMillis()) }
override fun deserialize(decoder: Decoder): Duration = Duration.ofMillis(decoder.decodeLong())
}
4 changes: 2 additions & 2 deletions infinitic-storage-mysql/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
dependencies {
// For connection pooling
implementation("com.zaxxer:HikariCP:5.0.1")
implementation("mysql:mysql-connector-java:8.0.29")
implementation("mysql:mysql-connector-java:8.0.30")
// For integration tests
testImplementation("org.testcontainers:mysql:1.17.1")
testImplementation("org.testcontainers:mysql:1.17.3")

implementation(Libs.Hoplite.core)

Expand Down

0 comments on commit a5da397

Please sign in to comment.