From bb0477eb9b0461345e32feaf24d2ff00c1c96136 Mon Sep 17 00:00:00 2001 From: Julien Lehuen Date: Wed, 12 May 2021 18:33:55 +0200 Subject: [PATCH 1/3] Bump to Kotlin 1.5 Kotlin 1.5 is out, but kotlin-logging still being on 1.4 causes dependency conflicts in my project. With this change, I bump the Kotlin version to 1.5. https://blog.jetbrains.com/kotlin/2021/05/kotlin-1-5-0-released/ --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a4d714e4..b7e6f0d8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.4.31" + kotlin("multiplatform") version "1.5.10" id("org.jetbrains.dokka") version "1.4.32" `maven-publish` id("io.github.gradle-nexus.publish-plugin") version "1.1.0" @@ -31,8 +31,8 @@ kotlin { compilations.all { // kotlin compiler compatibility options kotlinOptions { - apiVersion = "1.4" - languageVersion = "1.4" + apiVersion = "1.5" + languageVersion = "1.5" } } } From 954676599ac878be78c1487b0a67284204351b50 Mon Sep 17 00:00:00 2001 From: Ohad Shai Date: Tue, 13 Jul 2021 21:06:54 +0300 Subject: [PATCH 2/3] Update build.gradle.kts --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b7e6f0d8..14b1796a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.5.10" + kotlin("multiplatform") version "1.5.21" id("org.jetbrains.dokka") version "1.4.32" `maven-publish` id("io.github.gradle-nexus.publish-plugin") version "1.1.0" @@ -31,8 +31,8 @@ kotlin { compilations.all { // kotlin compiler compatibility options kotlinOptions { - apiVersion = "1.5" - languageVersion = "1.5" + apiVersion = "1.4" + languageVersion = "1.4" } } } From 7aba7ee5a31290a24769cdd01d2f742e73b9f9b5 Mon Sep 17 00:00:00 2001 From: Ohad Shai Date: Tue, 13 Jul 2021 21:30:29 +0300 Subject: [PATCH 3/3] Update build.gradle.kts --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 14b1796a..dda16906 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ plugins { kotlin("multiplatform") version "1.5.21" - id("org.jetbrains.dokka") version "1.4.32" + id("org.jetbrains.dokka") version "1.5.0" `maven-publish` id("io.github.gradle-nexus.publish-plugin") version "1.1.0" signing