From 7f58b50a478de78c232bf05e206218ecd0005c99 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Sat, 8 May 2021 16:53:03 +0100
Subject: [PATCH] Update to Kotlin 1.5.0

Signed-off-by: Graham <gpe@openrs2.org>
---
 build.gradle.kts          | 8 ++++++++
 gradle/libs.versions.toml | 2 +-
 settings.gradle.kts       | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

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<JacocoPluginExtension> {
+        /*
+         * Temporarily override bundled Jacoco for compatibility with Kotlin
+         * 1.5.
+         */
+        toolVersion = "0.8.7"
+    }
+
     plugins.withType<KotlinPluginWrapper> {
         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"
     }
 }