diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2021-11-24 16:46:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 16:46:54 +0100 |
| commit | a367b17de2bd1e10fd46c6133bf9ce5c2aca9867 (patch) | |
| tree | bc8072ed208881c28fe146fc578051774fec0858 | |
| parent | bacabd90c5bfb0388f477f64807e8ac8a7f5321b (diff) | |
| parent | b3fdcaabd6d345de31d736480998d2f32cb829f5 (diff) | |
merge: Update to Kotlin 1.6 (#45)
This pull request updates the Kotlin version used by OpenDC to 1.6
as well as updating the dependencies to their latest version where possible.
| -rw-r--r-- | buildSrc/build.gradle.kts | 4 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts | 1 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 22 |
3 files changed, 14 insertions, 13 deletions
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 0dab8647..f38919fd 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -31,9 +31,9 @@ repositories { } dependencies { - implementation(kotlin("gradle-plugin", version = "1.5.31")) + implementation(kotlin("gradle-plugin", version = "1.6.0")) implementation("org.jlleitschuh.gradle:ktlint-gradle:10.2.0") - implementation("org.jetbrains.kotlin:kotlin-allopen:1.5.31") + implementation("org.jetbrains.kotlin:kotlin-allopen:1.6.0") implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.6") implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.5.30") implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0") diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts index 6e4cab89..a69836f7 100644 --- a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts @@ -35,6 +35,7 @@ repositories { java { sourceCompatibility = Libs.jvmTarget + targetCompatibility = Libs.jvmTarget } tasks.withType<KotlinCompile>().configureEach { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 03402b9a..af82b146 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,23 +1,23 @@ [versions] -classgraph = "4.8.115" -clikt = "3.2.0" +classgraph = "4.8.135" +clikt = "3.3.0" config = "1.4.1" commons-math3 = "3.6.1" hadoop = "3.3.1" -jackson = "2.12.5" -junit-jupiter = "5.7.2" -junit-platform = "1.7.2" -kotlin-logging = "2.0.11" -kotlinx-coroutines = "1.5.1" -ktor = "1.6.3" +jackson = "2.13.0" +junit-jupiter = "5.8.1" +junit-platform = "1.8.1" +kotlin-logging = "2.1.0" +kotlinx-coroutines = "1.5.2" +ktor = "1.6.5" log4j = "2.14.1" -mockk = "1.12.0" +mockk = "1.12.1" opentelemetry-main = "1.6.0" opentelemetry-metrics = "1.6.0-alpha" opentelemetry-semconv = "1.6.0-alpha" -parquet = "1.12.0" +parquet = "1.12.2" progressbar = "0.9.0" -sentry = "5.1.2" +sentry = "5.4.1" slf4j = "1.7.32" [libraries] |