Update to Kotlin 1.9.10 and IDEA 2023.2

Him188 · Sep 2, 2023 · 1d30ac7 · 1d30ac7
1 parent c9c679a
commit 1d30ac7
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 25 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,14 +1,14 @@
 @file:Suppress("MemberVisibilityCanBePrivate")
 
 object Versions {
- const val intellij = "2023.1"
+ const val intellij = "2023.2"
 
- const val project = "3.1.0-182.1"
- const val idePlugin = "231-$project"
+ const val project = "3.1.0-191.1"
+ const val idePlugin = "232-$project"
 
- const val kotlin = "1.8.20"
+ const val kotlin = "1.9.10"
  val kotlinIdea: String? = null
- const val coroutines = "1.6.4"
+ const val coroutines = "1.7.0"
 
  const val publicationGroup = "me.him188"
 }
diff --git a/ide-plugin/build.gradle.kts b/ide-plugin/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
- id("org.jetbrains.intellij") version "1.13.3"
+ id("org.jetbrains.intellij") version "1.15.0"
  kotlin("jvm")
  kotlin("plugin.serialization")
 
@@ -65,7 +65,7 @@ tasks.getByName("publishPlugin", org.jetbrains.intellij.tasks.PublishPluginTask:
 
 tasks.withType<org.jetbrains.intellij.tasks.PatchPluginXmlTask> {
  sinceBuild.set("231.0")
- untilBuild.set("231.*")
+ untilBuild.set("232.*")
  changeNotes.set(
  """
  See <a href="https://github.com/Him188/kotlin-jvm-blocking-bridge">Release notes</a>

diff --git a/ide-plugin/run/below8/build.gradle.kts b/ide-plugin/run/below8/build.gradle.kts
@@ -1,15 +1,7 @@
-import me.him188.kotlin.jvm.blocking.bridge.compiler.UnitCoercion.COMPATIBILITY
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
  kotlin("jvm")
  id("me.him188.kotlin-jvm-blocking-bridge")
 }
 
 blockingBridge {
- unitCoercion = COMPATIBILITY
-}
-
-tasks.withType<KotlinCompile> {
- kotlinOptions.jvmTarget = "1.6"
 }
diff --git a/ide-plugin/run/build.gradle.kts b/ide-plugin/run/build.gradle.kts
@@ -1,15 +1,12 @@
-import me.him188.kotlin.jvm.blocking.bridge.compiler.UnitCoercion.COMPATIBILITY
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
- kotlin("jvm") version "1.4.21"
- id("me.him188.kotlin-jvm-blocking-bridge") version "2.0.0-160.3"
+ kotlin("jvm") version "1.8.20"
+ id("me.him188.kotlin-jvm-blocking-bridge") version "3.0.0-180.1"
 }
 
 blockingBridge {
 // enableForModule = true
-
- unitCoercion = COMPATIBILITY
 }
 
 group = "me.him188"
@@ -22,6 +19,10 @@ allprojects {
 
 }
 
+dependencies {
+ api("me.him188:kotlin-jvm-blocking-bridge-runtime:3.0.0-180.1")
+}
+
 tasks.withType<KotlinCompile>() {
  kotlinOptions.jvmTarget = "1.8"
  kotlinOptions.freeCompilerArgs += "-Xjvm-default=all"

diff --git a/ide-plugin/run/gradle/wrapper/gradle-wrapper.properties b/ide-plugin/run/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ide-plugin/run/mpp/build.gradle.kts b/ide-plugin/run/mpp/build.gradle.kts
@@ -22,7 +22,6 @@ kotlin {
  js(BOTH) {
  browser {
  commonWebpackConfig {
- cssSupport.enabled = true
  }
  }
  }

diff --git a/ide-plugin/run/src/main/kotlin/AnnotationOnFile.kt b/ide-plugin/run/src/main/kotlin/AnnotationOnFile.kt
@@ -6,7 +6,7 @@ suspend fun test() {
 
 }
 
-@JvmBlockingBridge // should error
+@JvmBlockingBridge
 suspend fun test2() {
 
 }
diff --git a/...n/src/main/kotlin/me/him188/kotlin/jvm/blocking/bridge/ide/BridgeProjectImportListener.kt b/...n/src/main/kotlin/me/him188/kotlin/jvm/blocking/bridge/ide/BridgeProjectImportListener.kt
@@ -6,8 +6,8 @@ import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskNotifica
 import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskType
 import com.intellij.openapi.progress.util.BackgroundTaskUtil
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.project.modules
 import com.intellij.openapi.util.Computable
-import org.jetbrains.kotlin.idea.util.projectStructure.allModules
 
 class BridgeProjectImportListener : Disposable, ExternalSystemTaskNotificationListenerAdapter() {
  override fun dispose() {
@@ -19,7 +19,7 @@ class BridgeProjectImportListener : Disposable, ExternalSystemTaskNotificationLi
  // At this point changes might be still not applied to project structure yet.
  val project = id.findResolvedProject() ?: return
  BackgroundTaskUtil.runUnderDisposeAwareIndicator(this, Computable {
- for (module in project.allModules()) {
+ for (module in project.modules.asList()) {
  module.getServiceIfCreated(BridgeModuleCacheService::class.java)?.initialized = false
  }
  })