github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-25 15:40:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use Kotlin compiler 1.4.0 but with stdlib 1.3.72

Browse Source
This commit is contained in:
Him188 2020-07-19 13:18:27 +08:00
parent abf33bb214
commit 9539218150
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/mirai-console/build.gradle.kts
View File

@ -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")

4
buildSrc/src/main/kotlin/Versions.kt
View File

@ -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"

6
frontend/mirai-console-pure/build.gradle.kts
View File

@ -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}")