KJBB 1.0.0 with Kotlin 1.4.0

README-chs.md

@@ -105,21 +105,21 @@ fun test(a1: Int, a2: Any): String = runBlocking { test(a1, a2) }
 
 ## 使用要求
 - Gradle (仅在 6.0+ 环境通过测试)
-- **Kotlin 1.4.0-rc, 1.4.0 或更高**
+- **Kotlin `1.4.0-rc`, `1.4.0` 或更高**
 - IntelliJ IDEA 或 Android Studio (推荐保持新版本)
 
 ## 现在体验
 
 编译器插件已经完成, 可添加 Gradle 插件依赖:
 
 1. **安装 IntelliJ IDEA (或 Android Studio) 插件**
-   本插件支持 IntelliJ IDEA 2019.\* 到 2020.\*
-   It's strongly recommended using the latest IntelliJ or AS, you may update using [JetBrains ToolBox](https://www.jetbrains.com/toolbox-app/)  
-   Please note that Eclipse and Visual Studio aren't supported.
+   本插件支持 IntelliJ IDEA 2019.\* 到 2020.\*  
+   强烈建议使用最新版本的 IntelliJ 或 AS, 可以使用 [JetBrains ToolBox](https://www.jetbrains.com/toolbox-app/) 获取更新  
+   Eclipse 和 Visual Studio 或其他 IDE 均不受支持.
 
-   1. Open `File->Settings->Plugins->Marketplace` in your IDE
-   2. Search `Kotlin Jvm Blocking Bridge`, download and install
-   3. Restart your IDE
+   1. 打开 `File->Settings->Plugins->Marketplace`
+   2. 搜索 `Kotlin Jvm Blocking Bridge`, 下载并安装
+   3. 重启 IDE
 
 
 2. **安装 Gradle 插件.**

README.md

@@ -111,15 +111,7 @@ fun test(a1: Int, a2: Any): String = runBlocking { test(a1, a2) }
 
 The plugin is ready to use.
 
-1. **Check Kotlin version**
-  This plugin requires some new features published in Kotlin `1.4.0-rc`, therefore, please check your Kotlin compiler version.
-    1. In your `build.gradle.kts` or `build.gradle`,
-        - If you use `plugins { }` DSL, please ensure `id("kotlin") version "1.4.0-rc"` or `kotlin("jvm") version "1.4.0-rc"`
-        - If you use `buildscript { }` DSL, please ensure `classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0-rc")`
-    2. In your IDE, open `Tools->Kotlin->Configure Kotlin Plugin Updates`, switch 'Update channel' to `Early Access Preview 1.4.x` and update.
-
-
-2. **Install IntelliJ IDEA (or Android Studio) plugin**  
+1. **Install IntelliJ IDEA (or Android Studio) plugin**  
    The plugin currently supports from 2019.\* to 2020.\*  
    It's strongly recommended using the latest IJ or AS, you may update using [JetBrains ToolBox](https://www.jetbrains.com/toolbox-app/)  
    Please note that Eclipse and Visual Studio aren't supported.

buildSrc/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
     api(ktor("client-json", "1.3.2"))
 
     compileOnly(gradleApi())
-    compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0-rc")
+    compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
     compileOnly("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
 
     implementation("com.github.jengelman.gradle.plugins:shadow:6.0.0")

buildSrc/src/main/kotlin/Versions.kt

@@ -1,10 +1,9 @@
 object Versions {
-    const val project = "0.9.0"
+    const val project = "1.0.0"
     const val idePlugin = "1.2.0"
 
-    const val kotlin = "1.4.0-rc"
-    const val coroutines = "1.3.8"
-
+    const val kotlin = "1.4.0"
+    const val coroutines = "1.3.9"
 
     const val bintray = "1.8.5"
 }

ide-plugin/build.gradle.kts

@@ -37,7 +37,7 @@ intellij {
     updateSinceUntilBuild = false
 
     setPlugins(
-        "org.jetbrains.kotlin:1.4.0-rc-release-IJ2020.2-2@staging"
+        "org.jetbrains.kotlin:1.4.0-release-IJ2020.2-1@staging"
     )
 }
 

ide-plugin/src/main/resources/META-INF/plugin.xml

@@ -12,11 +12,6 @@
     <description>
         This plugin provides @JvmBlockingBridge resolving for Java blocking bridge calls and create gutters for them.
         Find more information on source repository: https://github.com/mamoe/kotlin-jvm-blocking-bridge.
-
-        Note: This plugin depends on the new compiler plugin API which requires Kotlin plugin 1.4.0-M3, 1.4.0-rc or
-        higher and might not work properly with older Kotlin plugins, like 1.3.72
-        Please visit 'Configure your build for EAP' for updating your plugin:
-        https://kotlinlang.org/eap/configure-build-for-eap.html
     </description>
 
     <depends>com.intellij.modules.platform</depends>