Release version 1.10.6-1530.2

Him188 · Aug 6, 2021 · d6bae4f · d6bae4f
1 parent 5c170f3
commit d6bae4f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,7 +1,7 @@
 @file:Suppress("MemberVisibilityCanBePrivate")
 
 object Versions {
-    const val project = "1.10.6-1530"
+    const val project = "1.10.6-1530.2"
     const val idePlugin = project
 
     const val kotlin = "1.5.30-M1"

diff --git a/compiler-plugin/src/main/kotlin/net/mamoe/kjbb/compiler/backend/jvm/analyzing.kt b/compiler-plugin/src/main/kotlin/net/mamoe/kjbb/compiler/backend/jvm/analyzing.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.checkers.DeclarationCheckerContext
 import org.jetbrains.kotlin.resolve.descriptorUtil.parents
 import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
+import org.jetbrains.kotlin.resolve.source.PsiSourceElement
 import org.jetbrains.kotlin.resolve.source.PsiSourceFile
 import org.jetbrains.kotlin.resolve.source.getPsi
 
@@ -148,4 +149,4 @@ internal fun DeclarationDescriptor.jvmBlockingBridgeAnnotationPsi(): PsiElement?
 internal fun DeclarationDescriptor.jvmBlockingBridgeAnnotation(): AnnotationDescriptor? =
     annotations.findAnnotation(JVM_BLOCKING_BRIDGE_FQ_NAME)
 
-internal fun AnnotationDescriptor.findPsi(): PsiElement? = source.getPsi()
+internal fun AnnotationDescriptor.findPsi(): PsiElement? = (source as? PsiSourceElement)?.psi
diff --git a/gradle-plugin/src/main/kotlin/net/mamoe/kjbb/JvmBlockingBridgeGradlePlugin.kt b/gradle-plugin/src/main/kotlin/net/mamoe/kjbb/JvmBlockingBridgeGradlePlugin.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.*
 
-internal const val KJBB_VERSION = "1.10.6"
+internal const val KJBB_VERSION = "1.10.6-1530.2"
 
 internal fun BlockingBridgePluginExtension.toSubpluginOptionList(): List<SubpluginOption> {
     return listOf(

diff --git a/ide-plugin/run/build.gradle.kts b/ide-plugin/run/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm") version "1.4.21"
-    id("net.mamoe.kotlin-jvm-blocking-bridge") version "1.10.6"
+    id("net.mamoe.kotlin-jvm-blocking-bridge") version "1.10.6-1530.2"
 }
 
 blockingBridge {