Browse Source

Simplify buildscript

Him188 5 years ago
parent
commit
4f86d15ef3
2 changed files with 6 additions and 5 deletions
  1. 1 1
      buildSrc/src/main/kotlin/Versions.kt
  2. 5 4
      mirai-core/build.gradle.kts

+ 1 - 1
buildSrc/src/main/kotlin/Versions.kt

@@ -42,4 +42,4 @@ object Versions {
 fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$version"
 fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$version"
 
 
 @Suppress("unused")
 @Suppress("unused")
-fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
+fun ktor(id: String, version: String = Versions.Kotlin.ktor) = "io.ktor:ktor-$id:$version"

+ 5 - 4
mirai-core/build.gradle.kts

@@ -58,7 +58,7 @@ kotlin {
             languageSettings.progressiveMode = true
             languageSettings.progressiveMode = true
         }
         }
 
 
-        commonMain {
+        val commonMain by getting {
             dependencies {
             dependencies {
                 api(kotlin("stdlib", Versions.Kotlin.stdlib))
                 api(kotlin("stdlib", Versions.Kotlin.stdlib))
                 api(kotlin("serialization"))
                 api(kotlin("serialization"))
@@ -72,11 +72,12 @@ kotlin {
 
 
                 api("org.jetbrains.kotlinx:atomicfu-common:${Versions.Kotlin.atomicFU}")
                 api("org.jetbrains.kotlinx:atomicfu-common:${Versions.Kotlin.atomicFU}")
 
 
-                api(ktor("client-cio", Versions.Kotlin.ktor))
-                api(ktor("client-core", Versions.Kotlin.ktor))
-                api(ktor("network", Versions.Kotlin.ktor))
+                api(ktor("client-cio"))
+                api(ktor("client-core"))
+                api(ktor("network"))
             }
             }
         }
         }
+
         commonTest {
         commonTest {
             dependencies {
             dependencies {
                 implementation(kotlin("test-annotations-common"))
                 implementation(kotlin("test-annotations-common"))