diff --git a/backend/mirai-console/build.gradle.kts b/backend/mirai-console/build.gradle.kts index 41d9063d7..34f722ff1 100644 --- a/backend/mirai-console/build.gradle.kts +++ b/backend/mirai-console/build.gradle.kts @@ -3,8 +3,8 @@ import java.text.SimpleDateFormat import java.util.* plugins { - kotlin("jvm") version Versions.kotlin - kotlin("plugin.serialization") version Versions.kotlin + kotlin("jvm") version Versions.kotlinCompiler + kotlin("plugin.serialization") version Versions.kotlinCompiler id("java") `maven-publish` id("com.jfrog.bintray") @@ -66,7 +66,7 @@ kotlin { dependencies { compileAndRuntime("net.mamoe:mirai-core:${Versions.core}") - compileAndRuntime(kotlin("stdlib")) + compileAndRuntime(kotlin("stdlib", Versions.kotlinStdlib)) api("net.mamoe.yamlkt:yamlkt:0.3.1") api("org.jetbrains:annotations:19.0.0") diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 221c20995..62786f24b 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -14,7 +14,9 @@ object Versions { const val consoleTerminal = "0.1.0" const val consolePure = console - const val kotlin = "1.4-M3" + const val kotlinCompiler = "1.4-M3" // for public explict API + const val kotlinStdlib = "1.3.72" // for not overriding dependant's stdlib dependency + const val coroutines = "1.3.7" const val serialization = "0.20.0" const val ktor = "1.3.2" diff --git a/frontend/mirai-console-pure/build.gradle.kts b/frontend/mirai-console-pure/build.gradle.kts index 9e2f02879..fcc7850ec 100644 --- a/frontend/mirai-console-pure/build.gradle.kts +++ b/frontend/mirai-console-pure/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - kotlin("jvm") version Versions.kotlin - kotlin("plugin.serialization") version Versions.kotlin + kotlin("jvm") version Versions.kotlinCompiler + kotlin("plugin.serialization") version Versions.kotlinCompiler id("java") `maven-publish` id("com.jfrog.bintray") @@ -30,7 +30,7 @@ dependencies { compileAndRuntime(project(":mirai-console")) compileAndRuntime("net.mamoe:mirai-core:${Versions.core}") - compileAndRuntime(kotlin("stdlib")) // embedded by core + compileAndRuntime(kotlin("stdlib", Versions.kotlinStdlib)) // embedded by core runtimeOnly("net.mamoe:mirai-core-qqandroid:${Versions.core}") testApi("net.mamoe:mirai-core-qqandroid:${Versions.core}")