Skip to content

M
Mirai
Commit b9e00f41 authored by Him188's avatar Him188
Browse files
Options

Fix NPE

parent 27819d73
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 34 deletions
mirai-core-qqandroid/build.gradle.kts
View file @ b9e00f41
...@@ -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,17 +97,19 @@ kotlin { ...@@ -96,17 +97,19 @@ kotlin {
} }
} }
val androidMain by getting { if (isAndroidSDKAvailable) {
dependencies { val androidMain by getting {
dependencies {
}
} }
}
val androidTest by getting { val androidTest by getting {
dependencies { dependencies {
api(kotlin("test", kotlinVersion)) api(kotlin("test", kotlinVersion))
api(kotlin("test-junit", kotlinVersion)) api(kotlin("test-junit", kotlinVersion))
api(kotlin("test-annotations-common")) api(kotlin("test-annotations-common"))
api(kotlin("test-common")) api(kotlin("test-common"))
}
} }
} }
......
mirai-core-timpc/build.gradle.kts
View file @ b9e00f41
...@@ -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,17 +96,19 @@ kotlin { ...@@ -95,17 +96,19 @@ kotlin {
} }
} }
val androidMain by getting { if (isAndroidSDKAvailable) {
dependencies { val androidMain by getting {
dependencies {
}
} }
}
val androidTest by getting { val androidTest by getting {
dependencies { dependencies {
api(kotlin("test", kotlinVersion)) api(kotlin("test", kotlinVersion))
api(kotlin("test-junit", kotlinVersion)) api(kotlin("test-junit", kotlinVersion))
api(kotlin("test-annotations-common")) api(kotlin("test-annotations-common"))
api(kotlin("test-common")) api(kotlin("test-common"))
}
} }
} }
......
mirai-core/build.gradle.kts
View file @ b9e00f41
...@@ -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,23 +109,25 @@ kotlin { ...@@ -108,23 +109,25 @@ kotlin {
} }
} }
val androidMain by getting { if (isAndroidSDKAvailable) {
dependencies { val androidMain by getting {
api(kotlin("reflect", kotlinVersion)) dependencies {
api(kotlin("reflect", kotlinVersion))
api(kotlinx("serialization-runtime", serializationVersion)) api(kotlinx("serialization-runtime", serializationVersion))
api(kotlinx("coroutines-android", coroutinesVersion)) api(kotlinx("coroutines-android", coroutinesVersion))
api(ktor("client-android", ktorVersion)) api(ktor("client-android", ktorVersion))
}
} }
}
val androidTest by getting { val androidTest by getting {
dependencies { dependencies {
api(kotlin("test", kotlinVersion)) api(kotlin("test", kotlinVersion))
api(kotlin("test-junit", kotlinVersion)) api(kotlin("test-junit", kotlinVersion))
api(kotlin("test-annotations-common")) api(kotlin("test-annotations-common"))
api(kotlin("test-common")) api(kotlin("test-common"))
}
} }
} }
......
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