diff --git a/backend/mirai-console/build.gradle.kts b/backend/mirai-console/build.gradle.kts index 331694a36..556a66ab5 100644 --- a/backend/mirai-console/build.gradle.kts +++ b/backend/mirai-console/build.gradle.kts @@ -59,10 +59,11 @@ dependencies { compileAndRuntime("net.mamoe:mirai-core:${Versions.core}") compileAndRuntime(kotlin("stdlib-jdk8", Versions.kotlinStdlib)) - implementation(kotlinx("serialization-runtime", Versions.serialization)) + implementation(kotlinx("serialization-core", Versions.serialization)) 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(kotlinx("coroutines-jdk8", Versions.coroutines)) @@ -70,7 +71,7 @@ dependencies { //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(kotlin("stdlib-jdk8")) testApi(kotlin("test")) diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/description/CommandArgumentContext.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/description/CommandArgumentContext.kt index 2009f1267..47464eb95 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/description/CommandArgumentContext.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/description/CommandArgumentContext.kt @@ -168,7 +168,7 @@ public inline fun CommandArgumentContext(block: CommandArgumentContextBuilder.() * @see CommandArgumentContext */ public class CommandArgumentContextBuilder : MutableList> by mutableListOf() { - @JvmName("add") + @JvmName("add") // TODO: 2020/8/19 java class support public inline infix fun KClass.with(parser: CommandArgumentParser): ParserPair<*> = ParserPair(this, parser).also { add(it) } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 42232d8f9..e5763c011 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -23,13 +23,13 @@ dependencies { api("org.jsoup:jsoup:1.12.1") api("com.google.code.gson:gson:2.8.6") - api(kotlinx("coroutines-core", "1.3.3")) - api(ktor("client-core", "1.3.2")) - api(ktor("client-cio", "1.3.2")) - api(ktor("client-json", "1.3.2")) + api(kotlinx("coroutines-core", "1.3.9")) + api(ktor("client-core", "1.4.0")) + api(ktor("client-cio", "1.4.0")) + api(ktor("client-json", "1.4.0")) 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") api("com.github.jengelman.gradle.plugins:shadow:6.0.0") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/PublishingHelpers.kt b/buildSrc/src/main/kotlin/PublishingHelpers.kt index 32f80ed76..26f36ae06 100644 --- a/buildSrc/src/main/kotlin/PublishingHelpers.kt +++ b/buildSrc/src/main/kotlin/PublishingHelpers.kt @@ -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.Task diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 67b549429..fa5bb9060 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -17,7 +17,7 @@ */ object Versions { - const val core = "1.2.0" + const val core = "1.2.1" const val console = "1.0-M2" const val consoleGraphical = "0.0.7" const val consoleTerminal = "0.1.0" @@ -30,6 +30,7 @@ object Versions { const val collectionsImmutable = "0.3.2" const val serialization = "1.0.0-RC" const val ktor = "1.4.0" + const val atomicFU = "0.14.4" const val androidGradle = "3.6.2"