diff --git a/build.gradle.kts b/build.gradle.kts index ed46cbb93..7c73a1255 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,6 +10,7 @@ @file:Suppress("UnstableApiUsage", "UNUSED_VARIABLE") import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import net.mamoe.kjbb.compiler.UnitCoercion.COMPATIBILITY import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.kotlin.gradle.dsl.* import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation @@ -39,7 +40,7 @@ plugins { kotlin("jvm") version Versions.kotlinCompiler kotlin("plugin.serialization") version Versions.kotlinCompiler id("org.jetbrains.dokka") version Versions.dokka - id("net.mamoe.kotlin-jvm-blocking-bridge") version Versions.blockingBridge apply false + id("net.mamoe.kotlin-jvm-blocking-bridge") version Versions.blockingBridge id("com.jfrog.bintray") version Versions.bintray } @@ -89,6 +90,11 @@ allprojects { configureKotlinTestSettings() configureKotlinCompilerSettings() configureKotlinExperimentalUsages() + + blockingBridge { + unitCoercion = COMPATIBILITY + } + // useIr() if (isKotlinJvmProject) { @@ -96,7 +102,6 @@ allprojects { } } } - subprojects { afterEvaluate { if (project.name == "mirai-core-api") configureDokka() diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 7c6bf0a38..67c263045 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -28,7 +28,7 @@ object Versions { const val io = "0.1.16" const val coroutinesIo = "0.1.16" - const val blockingBridge = "1.6.0" + const val blockingBridge = "1.7.2" const val androidGradlePlugin = "3.5.3"