From d6bae4f7b4f73c179a8926edec714942f0708a55 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Fri, 6 Aug 2021 14:14:08 +0800
Subject: [PATCH] Release version 1.10.6-1530.2

---
 buildSrc/src/main/kotlin/Versions.kt                           | 2 +-
 .../kotlin/net/mamoe/kjbb/compiler/backend/jvm/analyzing.kt    | 3 ++-
 .../kotlin/net/mamoe/kjbb/JvmBlockingBridgeGradlePlugin.kt     | 2 +-
 ide-plugin/run/build.gradle.kts                                | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index 49ef8e2..f04f166 100644
--- 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
index ee28a4e..1c8068e 100644
--- 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()
\ No newline at end of file
+internal fun AnnotationDescriptor.findPsi(): PsiElement? = (source as? PsiSourceElement)?.psi
\ No newline at end of file
diff --git a/gradle-plugin/src/main/kotlin/net/mamoe/kjbb/JvmBlockingBridgeGradlePlugin.kt b/gradle-plugin/src/main/kotlin/net/mamoe/kjbb/JvmBlockingBridgeGradlePlugin.kt
index db73130..9fa7b52 100644
--- 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
index 323c327..c18cfda 100644
--- 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 {