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

Update versions

Browse Source
This commit is contained in:
Him188 2020-08-19 21:03:34 +08:00
parent 2cd91b17f3
commit 47e52e20dd
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,10 +59,11 @@ dependencies {
compileAndRuntime("net.mamoe:mirai-core:${Versions.core}") compileAndRuntime("net.mamoe:mirai-core:${Versions.core}")
compileAndRuntime(kotlin("stdlib-jdk8", Versions.kotlinStdlib)) compileAndRuntime(kotlin("stdlib-jdk8", Versions.kotlinStdlib))
implementation(kotlinx("serialization-runtime", Versions.serialization)) implementation(kotlinx("serialization-core", Versions.serialization))
implementation(kotlin("reflect")) implementation(kotlin("reflect"))
implementation("net.mamoe.yamlkt:yamlkt:0.3.1") implementation("net.mamoe.yamlkt:yamlkt:0.3.3")
implementation("org.jetbrains.kotlinx:atomicfu:${Versions.atomicFU}")
api("org.jetbrains:annotations:19.0.0") api("org.jetbrains:annotations:19.0.0")
api(kotlinx("coroutines-jdk8", Versions.coroutines)) api(kotlinx("coroutines-jdk8", Versions.coroutines))
@ -70,7 +71,7 @@ dependencies {
//api(kotlinx("collections-immutable", Versions.collectionsImmutable)) //api(kotlinx("collections-immutable", Versions.collectionsImmutable))
testApi(kotlinx("serialization-runtime", Versions.serialization)) testApi(kotlinx("serialization-core", Versions.serialization))
testApi("net.mamoe:mirai-core-qqandroid:${Versions.core}") testApi("net.mamoe:mirai-core-qqandroid:${Versions.core}")
testApi(kotlin("stdlib-jdk8")) testApi(kotlin("stdlib-jdk8"))
testApi(kotlin("test")) testApi(kotlin("test"))

2
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/description/CommandArgumentContext.kt
View File

@ -168,7 +168,7 @@ public inline fun CommandArgumentContext(block: CommandArgumentContextBuilder.()
* @see CommandArgumentContext * @see CommandArgumentContext
*/ */
public class CommandArgumentContextBuilder : MutableList<ParserPair<*>> by mutableListOf() { public class CommandArgumentContextBuilder : MutableList<ParserPair<*>> by mutableListOf() {
@JvmName("add") @JvmName("add") // TODO: 2020/8/19 java class support
public inline infix fun <T : Any> KClass<T>.with(parser: CommandArgumentParser<T>): ParserPair<*> = public inline infix fun <T : Any> KClass<T>.with(parser: CommandArgumentParser<T>): ParserPair<*> =
ParserPair(this, parser).also { add(it) } ParserPair(this, parser).also { add(it) }

10
buildSrc/build.gradle.kts
View File

@ -23,13 +23,13 @@ dependencies {
api("org.jsoup:jsoup:1.12.1") api("org.jsoup:jsoup:1.12.1")
api("com.google.code.gson:gson:2.8.6") api("com.google.code.gson:gson:2.8.6")
api(kotlinx("coroutines-core", "1.3.3")) api(kotlinx("coroutines-core", "1.3.9"))
api(ktor("client-core", "1.3.2")) api(ktor("client-core", "1.4.0"))
api(ktor("client-cio", "1.3.2")) api(ktor("client-cio", "1.4.0"))
api(ktor("client-json", "1.3.2")) api(ktor("client-json", "1.4.0"))
compileOnly(gradleApi()) 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") compileOnly("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
api("com.github.jengelman.gradle.plugins:shadow:6.0.0") api("com.github.jengelman.gradle.plugins:shadow:6.0.0")
} }

2
buildSrc/src/main/kotlin/PublishingHelpers.kt
View File

@ -1,4 +1,4 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "NOTHING_TO_INLINE", "RemoveRedundantBackticks")
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.Task import org.gradle.api.Task

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

@ -17,7 +17,7 @@
*/ */
object Versions { object Versions {
const val core = "1.2.0" const val core = "1.2.1"
const val console = "1.0-M2" const val console = "1.0-M2"
const val consoleGraphical = "0.0.7" const val consoleGraphical = "0.0.7"
const val consoleTerminal = "0.1.0" const val consoleTerminal = "0.1.0"
@ -30,6 +30,7 @@ object Versions {
const val collectionsImmutable = "0.3.2" const val collectionsImmutable = "0.3.2"
const val serialization = "1.0.0-RC" const val serialization = "1.0.0-RC"
const val ktor = "1.4.0" const val ktor = "1.4.0"
const val atomicFU = "0.14.4"
const val androidGradle = "3.6.2" const val androidGradle = "3.6.2"