Remove kapt and fix compiler

Author: Him188

README-chs.md

@@ -140,7 +140,7 @@ IntelliJ 会自动读取库中的函数信息, 因此 Java 用户可以正常使
 `build.gradle` 或 `build.gradle.kts`
 ```kotlin
 plugins {
-  id("net.mamoe.kotlin-jvm-blocking-bridge") version ""
+  id("net.mamoe.kotlin-jvm-blocking-bridge") version "1.5.0-KT-1.4.30-M1"
 }
 ```
 
@@ -155,7 +155,7 @@ pluginManagement {
 
 本插件会自动添加如下的运行时依赖:
 ```kotlin
-implementation("net.mamoe:kotlin-jvm-blocking-bridge:")
+implementation("net.mamoe:kotlin-jvm-blocking-bridge:1.5.0-KT-1.4.30-M1")
 ```
 因此只需要安装插件, 而不需要添加依赖即可使用
 

README.md

@@ -141,7 +141,7 @@ If you're developing a library with KJBB, you need to install the Gradle plugin
 `build.gradle` or `build.gradle.kts`
 ```kotlin
 plugins {
-  id("net.mamoe.kotlin-jvm-blocking-bridge") version ""
+  id("net.mamoe.kotlin-jvm-blocking-bridge") version "1.5.0-KT-1.4.30-M1"
 }
 ```
 
@@ -156,7 +156,7 @@ pluginManagement {
 
 The plugin will automatically install runtime library for you, as:
 ```kotlin
-implementation("net.mamoe:kotlin-jvm-blocking-bridge:")
+implementation("net.mamoe:kotlin-jvm-blocking-bridge:1.5.0-KT-1.4.30-M1")
 ```
 Therefore, you need only to install the plugin, and the compiler plugin will work finely.
 

compiler-plugin/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     kotlin("jvm")
-    kotlin("kapt")
     kotlin("plugin.serialization")
     id("java")
     signing
@@ -16,8 +15,6 @@ dependencies includeInShadow@{
 dependencies compileOnly@{
     compileOnly(kotlin("stdlib")) // don't include stdlib in shadow
     compileOnly("org.jetbrains.kotlin:kotlin-compiler:${Versions.kotlin}")
-    kapt("com.google.auto.service:auto-service:1.0-rc7")
-    compileOnly("com.google.auto.service:auto-service-annotations:1.0-rc7")
 }
 
 dependencies tests@{

compiler-plugin/src/main/kotlin/net/mamoe/kjbb/compiler/context/CompilerContext.kt

@@ -18,7 +18,7 @@ interface CompilerContext {
     fun JvmDeclarationOrigin(
         originKind: JvmDeclarationOriginKind,
         descriptor: DeclarationDescriptor,
-        parametersForJvmOverload: List<KtParameter?>? = listOf()
+        parametersForJvmOverload: List<KtParameter?>? = listOf(),
     ): JvmDeclarationOrigin
 
     sealed class CompilerContextKind {

compiler-plugin/src/main/kotlin/net/mamoe/kjbb/compiler/extensions/JvmBlockingBridgeCodegenJvmExtension.kt

@@ -1,16 +1,13 @@
 package net.mamoe.kjbb.compiler.extensions
 
-import com.google.auto.service.AutoService
 import net.mamoe.kjbb.compiler.backend.jvm.BridgeCodegen
 import org.jetbrains.kotlin.codegen.ImplementationBodyCodegen
 import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
 
 /**
  * For JVM backend
  */
-@AutoService(ExpressionCodegenExtension::class)
-open class JvmBlockingBridgeCodegenJvmExtension :
-    ExpressionCodegenExtension {
+open class JvmBlockingBridgeCodegenJvmExtension : ExpressionCodegenExtension {
 
     override fun generateClassSyntheticParts(codegen: ImplementationBodyCodegen) {
         BridgeCodegen(codegen).generate()

compiler-plugin/src/main/kotlin/net/mamoe/kjbb/compiler/extensions/JvmBlockingBridgeComponentRegistrar.kt

@@ -1,6 +1,5 @@
 package net.mamoe.kjbb.compiler.extensions
 
-import com.google.auto.service.AutoService
 import com.intellij.mock.MockProject
 import net.mamoe.kjbb.compiler.diagnostic.BlockingBridgeDeclarationChecker
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
@@ -14,7 +13,6 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
 import org.jetbrains.kotlin.platform.TargetPlatform
 
-@AutoService(ComponentRegistrar::class)
 @Suppress("unused")
 open class JvmBlockingBridgeComponentRegistrar : ComponentRegistrar {
 

compiler-plugin/src/main/kotlin/net/mamoe/kjbb/compiler/extensions/JvmBlockingBridgeIrGenerationExtension.kt

@@ -1,6 +1,5 @@
 package net.mamoe.kjbb.compiler.extensions
 
-import com.google.auto.service.AutoService
 import net.mamoe.kjbb.compiler.backend.ir.JvmBlockingBridgeClassLoweringPass
 import net.mamoe.kjbb.compiler.backend.ir.JvmBlockingBridgeFileLoweringPass
 import org.jetbrains.kotlin.backend.common.ClassLoweringPass
@@ -18,7 +17,6 @@ import org.jetbrains.kotlin.ir.visitors.acceptVoid
 /**
  * For IR backend.
  */
-@AutoService(IrGenerationExtension::class)
 open class JvmBlockingBridgeIrGenerationExtension : IrGenerationExtension {
     override fun generate(moduleFragment: IrModuleFragment, pluginContext: IrPluginContext) {
         for (file in moduleFragment.files) {

compiler-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension

@@ -0,0 +1 @@
+net.mamoe.kjbb.compiler.extensions.JvmBlockingBridgeIrGenerationExtension

compiler-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension

@@ -0,0 +1 @@
+net.mamoe.kjbb.compiler.extensions.JvmBlockingBridgeCodegenJvmExtension

compiler-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar

@@ -0,0 +1 @@
+net.mamoe.kjbb.compiler.extensions.JvmBlockingBridgeComponentRegistrar

gradle-plugin/build.gradle.kts

@@ -2,7 +2,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     kotlin("jvm")
-    kotlin("kapt")
     id("java-gradle-plugin")
     id("com.gradle.plugin-publish")
     id("java")

gradle-plugin/src/main/kotlin/net/mamoe/kjbb/JvmBlockingBridgeGradlePlugin.kt

@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.*
 
-internal const val JBB_VERSION = ""
+internal const val JBB_VERSION = "1.5.0-KT-1.4.30-M1"
 
 internal const val PLUGIN_ID = "net.mamoe.kotlin-jvm-blocking-bridge-compiler-embeddable"
 

ide-plugin/build.gradle.kts

@@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
 plugins {
     id("org.jetbrains.intellij") version "0.4.16"
     kotlin("jvm")
-    kotlin("kapt")
     kotlin("plugin.serialization")
     id("java")
     signing
@@ -20,9 +19,6 @@ dependencies {
     api(project(":kotlin-jvm-blocking-bridge"))
     api(project(":kotlin-jvm-blocking-bridge-compiler"))
 
-    kapt("com.google.auto.service:auto-service:1.0-rc7")
-    compileOnly("com.google.auto.service:auto-service-annotations:1.0-rc7")
-
     compileOnly("org.jetbrains.kotlin:kotlin-compiler:${Versions.kotlin}")
 
     compileOnly(files("build/idea-sandbox/plugins/Kotlin/lib/ide-common.jar"))

ide-plugin/run/build.gradle.kts

@@ -1,8 +1,8 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.4.20-RC"
-    id("net.mamoe.kotlin-jvm-blocking-bridge") version ""
+    kotlin("jvm") version "1.4.30-M1"
+    // id("net.mamoe.kotlin-jvm-blocking-bridge") version "1.5.0-KT-1.4.30-M1"
 }
 
 group = "me.him188"
@@ -15,6 +15,7 @@ repositories {
 }
 
 dependencies {
+    api("net.mamoe:kotlin-jvm-blocking-bridge:1.5.0-KT-1.4.30-M1")
     testImplementation(kotlin("test-junit"))
 }
 

ide-plugin/src/main/kotlin/net/mamoe/kjbb/ide/CompilerContextIntelliJ.kt

@@ -1,6 +1,5 @@
 package net.mamoe.kjbb.ide
 
-import com.google.auto.service.AutoService
 import com.intellij.openapi.util.Key
 import com.intellij.psi.PsiElement
 import net.mamoe.kjbb.compiler.context.CompilerContext
@@ -11,7 +10,6 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind
 import org.jetbrains.kotlin.resolve.source.PsiSourceElement
 
-@AutoService(CompilerContext::class)
 open class CompilerContextIntelliJ : CompilerContext {
     companion object : CompilerContextIntelliJ()
 

ide-plugin/src/main/kotlin/net/mamoe/kjbb/ide/JvmBlockingBridgeCallResolutionInterceptorExtension.kt

@@ -2,7 +2,6 @@
 
 package net.mamoe.kjbb.ide
 
-import com.google.auto.service.AutoService
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.extensions.internal.CallResolutionInterceptorExtension
@@ -22,7 +21,6 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValueWithSmartCastI
 /**
  * Hide bridges for Kotlin
  */
-@AutoService(CallResolutionInterceptorExtension::class)
 @OptIn(InternalNonStableExtensionPoints::class)
 class JvmBlockingBridgeCallResolutionInterceptorExtension : CallResolutionInterceptorExtension {
     @Suppress("OverridingDeprecatedMember")

ide-plugin/src/main/kotlin/net/mamoe/kjbb/ide/JvmBlockingBridgeIntelliJComponentRegistrar.kt

@@ -1,6 +1,5 @@
 package net.mamoe.kjbb.ide
 
-import com.google.auto.service.AutoService
 import com.intellij.mock.MockProject
 import net.mamoe.kjbb.compiler.backend.jvm.BridgeCodegen
 import net.mamoe.kjbb.compiler.extensions.JvmBlockingBridgeIrGenerationExtension
@@ -13,7 +12,6 @@ import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
 import org.jetbrains.kotlin.extensions.internal.CandidateInterceptor
 import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension
 
-@AutoService(ComponentRegistrar::class)
 @Suppress("unused")
 open class JvmBlockingBridgeIntelliJComponentRegistrar : ComponentRegistrar {
 

ide-plugin/src/main/kotlin/net/mamoe/kjbb/ide/JvmBlockingBridgeResolveExtension.kt

@@ -1,11 +1,9 @@
 package net.mamoe.kjbb.ide
 
-import com.google.auto.service.AutoService
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension
 
-@AutoService(SyntheticResolveExtension::class)
 class JvmBlockingBridgeResolveExtension : SyntheticResolveExtension {
     override fun getPossibleSyntheticNestedClassNames(thisDescriptor: ClassDescriptor): List<Name>? {
         return super.getSyntheticNestedClassNames(thisDescriptor)

ide-plugin/src/main/resources/META-INF/services/net.mamoe.kjbb.compiler.context.CompilerContext

@@ -0,0 +1 @@
+net.mamoe.kjbb.ide.CompilerContextIntelliJ

ide-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar

@@ -0,0 +1 @@
+net.mamoe.kjbb.ide.JvmBlockingBridgeIntelliJComponentRegistrar

ide-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.extensions.internal.CallResolutionInterceptorExtension

@@ -0,0 +1 @@
+net.mamoe.kjbb.ide.JvmBlockingBridgeCallResolutionInterceptorExtension

ide-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension

@@ -0,0 +1 @@
+net.mamoe.kjbb.ide.JvmBlockingBridgeResolveExtension

ide-plugin/untitled/src/main/kotlin/test.kt

@@ -0,0 +1,7 @@
+open class AClass {
+    companion object {
+        @JvmStatic
+        open suspend fun comp() {
+        }
+    }
+}

runtime/build.gradle.kts

@@ -2,7 +2,6 @@
 
 plugins {
     kotlin("multiplatform")
-    kotlin("kapt")
     kotlin("plugin.serialization")
     id("java")
     `maven-publish`