KTOR-5544 Update Kotlin to 1.8.10

48138bbd · Leonid Stashevsky · Leonid Stashevsky · ea22a73d · 48138bbd · 48138bbd
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@

 [![Official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![Maven Central](https://img.shields.io/maven-central/v/io.ktor/ktor)](https://mvnrepository.com/artifact/io.ktor)
-[![Kotlin](https://img.shields.io/badge/kotlin-1.6.21-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.8.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/ktor/)
 [![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
 [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/ktorio/ktor)

--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,7 +24,7 @@ buildscript {
        val kotlin_version: String? by extra
        if (kotlin_version == null) {
            throw IllegalArgumentException(
-                "'kotlin_snapshot_version' should be defined when building with snapshot compiler"
+                "'kotlin_snapshot_version' should be defined when building with snapshot compiler",
            )
        }
        repositories {
@@ -76,7 +76,7 @@ apply(from = "gradle/verifier.gradle")
 extra["skipPublish"] = mutableListOf<String>()
 extra["nonDefaultProjectStructure"] = mutableListOf(
    "ktor-bom",
-    "ktor-java-modules-test"
+    "ktor-java-modules-test",
 )

 val disabledExplicitApiModeProjects = listOf(
@@ -93,7 +93,7 @@ apply(from = "gradle/compatibility.gradle")
 plugins {
    id("org.jetbrains.dokka") version "1.7.20" apply false
    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.12.1"
-    id("kotlinx-atomicfu") version "0.18.5" apply false
+    id("kotlinx-atomicfu") version "0.19.0" apply false
    id("com.osacky.doctor") version "0.8.1"
 }

@@ -159,10 +159,9 @@ fun configureDokka() {
    val dokkaOutputDir = "../versions"

    tasks.withType<DokkaMultiModuleTask> {
-        val mapOf = mapOf(
-            "org.jetbrains.dokka.versioning.VersioningPlugin" to
-                """{ "version": "$configuredVersion", "olderVersionsDir":"$dokkaOutputDir" }"""
-        )
+        val id = "org.jetbrains.dokka.versioning.VersioningPlugin"
+        val config = """{ "version": "$configuredVersion", "olderVersionsDir":"$dokkaOutputDir" }"""
+        val mapOf = mapOf(id to config)

        outputDirectory.set(file(projectDir.toPath().resolve(dokkaOutputDir).resolve(configuredVersion)))
        pluginsMapConfiguration.set(mapOf)

--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -22,8 +22,8 @@ sourceSets.main {
 }

 dependencies {
-    implementation(kotlin("gradle-plugin", "1.7.20"))
-    implementation(kotlin("serialization", "1.7.20"))
+    implementation(kotlin("gradle-plugin", "1.8.10"))
+    implementation(kotlin("serialization", "1.8.10"))

    val ktlint_version = libs.versions.ktlint.version.get()
    implementation("org.jmailen.gradle:kotlinter-gradle:$ktlint_version")

--- a/gradle.properties
+++ b/gradle.properties
@@ -11,10 +11,6 @@ kotlin.code.style=official

 # config
 version=2.3.0-SNAPSHOT
-kotlin.incremental.js=true
-kotlin.incremental.multiplatform=true
-kotlin.native.ignoreIncorrectDependencies=true
-kotlin.native.binary.memoryModel=experimental

 # gradle
 org.gradle.daemon=true
@@ -29,10 +25,19 @@ kotlin.mpp.enableCompatibilityMetadataVariant=true
 kotlin.js.compiler=both
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.internal.mpp.hierarchicalStructureByDefault=true
+kotlin.incremental.js=true
+kotlin.incremental.multiplatform=true
+kotlin.native.ignoreIncorrectDependencies=true
+kotlin.native.binary.memoryModel=experimental
+kotlinx.atomicfu.enableJvmIrTransformation=true
+kotlinx.atomicfu.enableJsIrTransformation=true

-kotlin_version=1.7.20
+kotlin_version=1.8.10
 coroutines_version=1.6.4
-atomicfu_version=0.18.5
+atomicfu_version=0.18.0
 slf4j_version=1.7.36
 junit_version=4.13.2
 logback_version=1.2.11
+
+
+