diff --git a/backend/mirai-console/build.gradle.kts b/backend/mirai-console/build.gradle.kts index bf46b81c7..1eb497fc3 100644 --- a/backend/mirai-console/build.gradle.kts +++ b/backend/mirai-console/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { compileAndRuntime("net.mamoe:mirai-core:${Versions.Mirai.core}") compileAndRuntime(kotlin("stdlib")) - api("net.mamoe.yamlkt:yamlkt:0.3.0") + api("net.mamoe.yamlkt:yamlkt:0.3.1") api("org.jsoup:jsoup:1.12.1") diff --git a/buildSrc/src/main/kotlin/versions.kt b/buildSrc/src/main/kotlin/Versions.kt similarity index 55% rename from buildSrc/src/main/kotlin/versions.kt rename to buildSrc/src/main/kotlin/Versions.kt index 2e1176452..6647de79e 100644 --- a/buildSrc/src/main/kotlin/versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,6 +1,3 @@ -import org.gradle.api.artifacts.dsl.DependencyHandler -import org.gradle.kotlin.dsl.DependencyHandlerScope - /* * Copyright 2020 Mamoe Technologies and contributors. * @@ -12,7 +9,7 @@ import org.gradle.kotlin.dsl.DependencyHandlerScope object Versions { object Mirai { - const val core = "1.0-RC2-1" + const val core = "1.0.0" const val console = "0.5.1" const val consoleGraphical = "0.0.7" const val consoleTerminal = "0.1.0" @@ -21,20 +18,8 @@ object Versions { object Kotlin { const val stdlib = "1.3.72" - const val coroutines = "1.3.5" + const val coroutines = "1.3.7" const val serialization = "0.20.0" const val ktor = "1.3.2" } -} - -@Suppress("unused") -fun DependencyHandlerScope.kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$version" - -@Suppress("unused") -fun DependencyHandlerScope.ktor(id: String, version: String = Versions.Kotlin.ktor) = "io.ktor:ktor-$id:$version" - -@Suppress("unused") -fun DependencyHandler.compileAndRuntime(any: Any) { - add("compileOnly", any) - add("runtimeOnly", any) -} +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/dependencyExtensions.kt b/buildSrc/src/main/kotlin/dependencyExtensions.kt new file mode 100644 index 000000000..03bee26e5 --- /dev/null +++ b/buildSrc/src/main/kotlin/dependencyExtensions.kt @@ -0,0 +1,14 @@ +import org.gradle.api.artifacts.dsl.DependencyHandler +import org.gradle.kotlin.dsl.DependencyHandlerScope + +@Suppress("unused") +fun DependencyHandlerScope.kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$version" + +@Suppress("unused") +fun DependencyHandlerScope.ktor(id: String, version: String = Versions.Kotlin.ktor) = "io.ktor:ktor-$id:$version" + +@Suppress("unused") +fun DependencyHandler.compileAndRuntime(any: Any) { + add("compileOnly", any) + add("runtimeOnly", any) +}