diff --git a/build.gradle.kts b/build.gradle.kts index 0583abd7..a018704a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -101,6 +101,14 @@ val Project.isFree: Boolean configure(subprojects.filter { it.isFree }) { apply(plugin = "jacoco") + configure { + /* + * Temporarily override bundled Jacoco for compatibility with Kotlin + * 1.5. + */ + toolVersion = "0.8.7" + } + plugins.withType { apply(plugin = "org.jetbrains.dokka") apply(plugin = "org.jmailen.kotlinter") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6d90db7c..9b5577fa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ guice = "5.0.1" jackson = "2.12.3" jimfs = "1.2" junit = "5.7.1" -kotlin = "1.4.32" +kotlin = "1.5.0" kotlinCoroutines = "1.4.3" ktor = "1.5.4" netty = "4.1.63.Final" diff --git a/settings.gradle.kts b/settings.gradle.kts index 1e9b5c42..442044b4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,7 @@ pluginManagement { id("com.github.johnrengelman.shadow") version "7.0.0" id("org.jetbrains.dokka") version "1.4.32" id("org.jmailen.kotlinter") version "3.4.0" - kotlin("jvm") version "1.4.32" + kotlin("jvm") version "1.5.0" } }