Commit b9e00f41 authored by Him188's avatar Him188

Fix NPE

parent 27819d73
...@@ -30,8 +30,9 @@ fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version" ...@@ -30,8 +30,9 @@ fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
description = "QQ protocol library" description = "QQ protocol library"
version = rootProject.ext.get("mirai_version")!!.toString() version = rootProject.ext.get("mirai_version")!!.toString()
val isAndroidSDKAvailable: Boolean by project
kotlin { kotlin {
val isAndroidSDKAvailable: Boolean by project
if (isAndroidSDKAvailable) { if (isAndroidSDKAvailable) {
android("android") { android("android") {
publishAllLibraryVariants() publishAllLibraryVariants()
...@@ -96,6 +97,7 @@ kotlin { ...@@ -96,6 +97,7 @@ kotlin {
} }
} }
if (isAndroidSDKAvailable) {
val androidMain by getting { val androidMain by getting {
dependencies { dependencies {
} }
...@@ -109,6 +111,7 @@ kotlin { ...@@ -109,6 +111,7 @@ kotlin {
api(kotlin("test-common")) api(kotlin("test-common"))
} }
} }
}
val jvmMain by getting { val jvmMain by getting {
dependencies { dependencies {
......
...@@ -30,8 +30,9 @@ fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version" ...@@ -30,8 +30,9 @@ fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
description = "QQ protocol library" description = "QQ protocol library"
version = rootProject.ext.get("mirai_version")!!.toString() version = rootProject.ext.get("mirai_version")!!.toString()
val isAndroidSDKAvailable: Boolean by project
kotlin { kotlin {
val isAndroidSDKAvailable: Boolean by project
if (isAndroidSDKAvailable) { if (isAndroidSDKAvailable) {
android("android") { android("android") {
publishAllLibraryVariants() publishAllLibraryVariants()
...@@ -95,6 +96,7 @@ kotlin { ...@@ -95,6 +96,7 @@ kotlin {
} }
} }
if (isAndroidSDKAvailable) {
val androidMain by getting { val androidMain by getting {
dependencies { dependencies {
} }
...@@ -108,6 +110,7 @@ kotlin { ...@@ -108,6 +110,7 @@ kotlin {
api(kotlin("test-common")) api(kotlin("test-common"))
} }
} }
}
val jvmMain by getting { val jvmMain by getting {
dependencies { dependencies {
......
...@@ -29,8 +29,9 @@ fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version" ...@@ -29,8 +29,9 @@ fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
description = "QQ protocol library" description = "QQ protocol library"
val isAndroidSDKAvailable: Boolean by project
kotlin { kotlin {
val isAndroidSDKAvailable: Boolean by project
if (isAndroidSDKAvailable) { if (isAndroidSDKAvailable) {
android("android") { android("android") {
publishAllLibraryVariants() publishAllLibraryVariants()
...@@ -108,6 +109,7 @@ kotlin { ...@@ -108,6 +109,7 @@ kotlin {
} }
} }
if (isAndroidSDKAvailable) {
val androidMain by getting { val androidMain by getting {
dependencies { dependencies {
api(kotlin("reflect", kotlinVersion)) api(kotlin("reflect", kotlinVersion))
...@@ -127,6 +129,7 @@ kotlin { ...@@ -127,6 +129,7 @@ kotlin {
api(kotlin("test-common")) api(kotlin("test-common"))
} }
} }
}
val jvmMain by getting { val jvmMain by getting {
dependencies { dependencies {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment