Update to Kotlin 1.8.0 (#2146)

Kotlin · Jan 5, 2023 · 581fc3f · 581fc3f
1 parent 1c223b8
commit 581fc3f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/buildSrc/src/main/kotlin/Java9Modularity.kt b/buildSrc/src/main/kotlin/Java9Modularity.kt
@@ -23,7 +23,7 @@ object Java9Modularity {
         val ideaActive = System.getProperty("idea.active") == "true"
         if (disableJPMS || ideaActive) return
         val kotlin = extensions.findByType<KotlinProjectExtension>() ?: return
-        val jvmTargets = kotlin.targets.filter { it is KotlinJvmTarget || it is KotlinWithJavaTarget<*> }
+        val jvmTargets = kotlin.targets.filter { it is KotlinJvmTarget || it is KotlinWithJavaTarget<*, *> }
         if (jvmTargets.isEmpty()) {
             logger.warn("No Kotlin JVM targets found, can't configure compilation of module-info!")
         }

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@
 group=org.jetbrains.kotlinx
 version=1.5.0-SNAPSHOT
 
-kotlin.version=1.7.20
+kotlin.version=1.8.0
 
 # This version take precedence if 'bootstrap' property passed to project
 kotlin.version.snapshot=1.8.255-SNAPSHOT

diff --git a/integration-test/gradle.properties b/integration-test/gradle.properties
@@ -2,7 +2,7 @@
 # Copyright 2017-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
 #
 
-mainKotlinVersion=1.7.20
+mainKotlinVersion=1.8.0
 mainLibVersion=1.5.0-SNAPSHOT
 
 kotlin.code.style=official