github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-14 23:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix : group.uploadImage causes compiler error in Java

Browse Source
This commit is contained in:
Him188 2020-08-19 20:36:31 +08:00
parent 5edcf410b6
commit 9bf6a59d9b
2 changed files with 22 additions and 9 deletions
mirai-core-qqandroid
build.gradle.kts
mirai-core
build.gradle.kts

4
mirai-core-qqandroid/build.gradle.kts
View File

@ -64,7 +64,7 @@ kotlin {
api(kotlinx("coroutines-core", Versions.Kotlin.coroutines))
implementation(kotlinx("serialization-protobuf", Versions.Kotlin.serialization))
api("org.jetbrains.kotlinx:atomicfu:${Versions.Kotlin.atomicFU}")
implementation(kotlinx("io", Versions.Kotlin.io)) {
api(kotlinx("io", Versions.Kotlin.io)) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
implementation(kotlinx("coroutines-io", Versions.Kotlin.coroutinesIo))
@ -99,7 +99,7 @@ kotlin {
dependencies {
runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE
implementation("org.bouncycastle:bcprov-jdk15on:1.64")
implementation(kotlinx("io-jvm", Versions.Kotlin.io)) {
api(kotlinx("io-jvm", Versions.Kotlin.io)) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
// api(kotlinx("coroutines-debug", Versions.Kotlin.coroutines))

27
mirai-core/build.gradle.kts
View File

@ -65,8 +65,12 @@ kotlin {
api(kotlinx("serialization-core", Versions.Kotlin.serialization))
implementation(kotlinx("serialization-protobuf", Versions.Kotlin.serialization))
implementation(kotlinx("io", Versions.Kotlin.io))
implementation(kotlinx("coroutines-io", Versions.Kotlin.coroutinesIo))
api(kotlinx("io", Versions.Kotlin.io)) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
api(kotlinx("coroutines-io", Versions.Kotlin.coroutinesIo)) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
api(kotlinx("coroutines-core", Versions.Kotlin.coroutines))
implementation("org.jetbrains.kotlinx:atomicfu:${Versions.Kotlin.atomicFU}")
@ -89,8 +93,12 @@ kotlin {
dependencies {
api(kotlin("reflect"))
implementation(kotlinx("io-jvm", Versions.Kotlin.io))
implementation(kotlinx("coroutines-io-jvm", Versions.Kotlin.coroutinesIo))
api(kotlinx("io-jvm", Versions.Kotlin.io)) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
api(kotlinx("coroutines-io-jvm", Versions.Kotlin.coroutinesIo)) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
api(ktor("client-android", Versions.Kotlin.ktor))
}
@ -115,8 +123,12 @@ kotlin {
compileOnly("org.slf4j:slf4j-api:" + Versions.Logging.slf4j)
api(ktor("client-core-jvm", Versions.Kotlin.ktor))
implementation(kotlinx("io-jvm", Versions.Kotlin.io))
implementation(kotlinx("coroutines-io-jvm", Versions.Kotlin.coroutinesIo))
api(kotlinx("io-jvm", Versions.Kotlin.io)) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
api(kotlinx("coroutines-io-jvm", Versions.Kotlin.coroutinesIo)) {
exclude("org.jetbrains.kotlin", "kotlin-stdlib")
}
runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE
}
@ -143,7 +155,8 @@ tasks.withType<com.jfrog.bintray.gradle.tasks.BintrayUploadTask> {
.forEach { publication ->
val moduleFile = buildDir.resolve("publications/${publication.name}/module.json")
if (moduleFile.exists()) {
publication.artifact(object : org.gradle.api.publish.maven.internal.artifact.FileBasedMavenArtifact(moduleFile) {
publication.artifact(object :
org.gradle.api.publish.maven.internal.artifact.FileBasedMavenArtifact(moduleFile) {
override fun getDefaultExtension() = "module"
})
}