Update to Kotlin 1.5.0

Signed-off-by: Graham <gpe@openrs2.org>
bzip2
Graham 4 years ago
parent 40eb0302f7
commit 7f58b50a47
  1. 8
      build.gradle.kts
  2. 2
      gradle/libs.versions.toml
  3. 2
      settings.gradle.kts

@ -101,6 +101,14 @@ val Project.isFree: Boolean
configure(subprojects.filter { it.isFree }) { configure(subprojects.filter { it.isFree }) {
apply(plugin = "jacoco") apply(plugin = "jacoco")
configure<JacocoPluginExtension> {
/*
* Temporarily override bundled Jacoco for compatibility with Kotlin
* 1.5.
*/
toolVersion = "0.8.7"
}
plugins.withType<KotlinPluginWrapper> { plugins.withType<KotlinPluginWrapper> {
apply(plugin = "org.jetbrains.dokka") apply(plugin = "org.jetbrains.dokka")
apply(plugin = "org.jmailen.kotlinter") apply(plugin = "org.jmailen.kotlinter")

@ -6,7 +6,7 @@ guice = "5.0.1"
jackson = "2.12.3" jackson = "2.12.3"
jimfs = "1.2" jimfs = "1.2"
junit = "5.7.1" junit = "5.7.1"
kotlin = "1.4.32" kotlin = "1.5.0"
kotlinCoroutines = "1.4.3" kotlinCoroutines = "1.4.3"
ktor = "1.5.4" ktor = "1.5.4"
netty = "4.1.63.Final" netty = "4.1.63.Final"

@ -17,7 +17,7 @@ pluginManagement {
id("com.github.johnrengelman.shadow") version "7.0.0" id("com.github.johnrengelman.shadow") version "7.0.0"
id("org.jetbrains.dokka") version "1.4.32" id("org.jetbrains.dokka") version "1.4.32"
id("org.jmailen.kotlinter") version "3.4.0" id("org.jmailen.kotlinter") version "3.4.0"
kotlin("jvm") version "1.4.32" kotlin("jvm") version "1.5.0"
} }
} }

Loading…
Cancel
Save