mirror of
https://github.com/mamoe/mirai.git
synced 2025-03-10 04:00:08 +08:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
85a62520f7
@ -1,7 +1,7 @@
|
||||
# style guide
|
||||
kotlin.code.style=official
|
||||
# config
|
||||
mirai_version=0.22.0
|
||||
miraiVersion=0.22.0
|
||||
mirai_console_version=0.3.0
|
||||
kotlin.incremental.multiplatform=true
|
||||
kotlin.parallel.tasks.in.project=true
|
||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
||||
#Thu Feb 27 13:09:44 CST 2020
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
|
@ -28,18 +28,15 @@ fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$v
|
||||
|
||||
fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
|
||||
|
||||
val mirai_version: String by rootProject.ext
|
||||
val miraiVersion: String by rootProject.ext
|
||||
|
||||
dependencies {
|
||||
implementation("net.mamoe:mirai-core-jvm:$mirai_version")
|
||||
implementation("net.mamoe:mirai-core-qqandroid-jvm:$mirai_version")
|
||||
|
||||
// api(project(":mirai-api-http"))
|
||||
implementation("net.mamoe:mirai-core-jvm:$miraiVersion")
|
||||
implementation("net.mamoe:mirai-core-qqandroid-jvm:$miraiVersion")
|
||||
api(project(":mirai-console"))
|
||||
|
||||
api(group = "no.tornado", name = "tornadofx", version = "1.7.19")
|
||||
api(group = "com.jfoenix", name = "jfoenix", version = "9.0.8")
|
||||
api("org.bouncycastle:bcprov-jdk15on:1.64")
|
||||
// classpath is not set correctly by IDE
|
||||
}
|
||||
|
||||
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
|
||||
|
@ -30,15 +30,12 @@ fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$v
|
||||
fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
|
||||
|
||||
|
||||
val mirai_version: String by rootProject.ext
|
||||
val miraiVersion: String by rootProject.ext
|
||||
|
||||
dependencies {
|
||||
implementation("net.mamoe:mirai-core-jvm:$mirai_version")
|
||||
implementation("net.mamoe:mirai-core-qqandroid-jvm:$mirai_version")
|
||||
|
||||
// api(project(":mirai-api-http"))
|
||||
implementation("net.mamoe:mirai-core-jvm:$miraiVersion")
|
||||
implementation("net.mamoe:mirai-core-qqandroid-jvm:$miraiVersion")
|
||||
api(project(":mirai-console"))
|
||||
|
||||
api(group = "com.googlecode.lanterna", name = "lanterna", version = "3.0.2")
|
||||
api("org.bouncycastle:bcprov-jdk15on:1.64")
|
||||
// classpath is not set correctly by IDE
|
||||
}
|
@ -33,21 +33,17 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>() {
|
||||
}
|
||||
|
||||
|
||||
val mirai_version: String by rootProject.ext
|
||||
val miraiVersion: String by rootProject.ext
|
||||
|
||||
dependencies {
|
||||
implementation("net.mamoe:mirai-core-jvm:$mirai_version")
|
||||
implementation("net.mamoe:mirai-core-qqandroid-jvm:$mirai_version")
|
||||
|
||||
implementation("net.mamoe:mirai-core-jvm:$miraiVersion")
|
||||
implementation("net.mamoe:mirai-core-qqandroid-jvm:$miraiVersion")
|
||||
|
||||
api(kotlin("serialization"))
|
||||
api(group = "com.alibaba", name = "fastjson", version = "1.2.62")
|
||||
api(group = "org.yaml", name = "snakeyaml", version = "1.25")
|
||||
api(group = "com.moandjiezana.toml", name = "toml4j", version = "0.7.2")
|
||||
api("org.bouncycastle:bcprov-jdk15on:1.64")
|
||||
|
||||
implementation("no.tornado:tornadofx:1.7.19")
|
||||
// classpath is not set correctly by IDE
|
||||
api("no.tornado:tornadofx:1.7.19")
|
||||
}
|
||||
|
||||
val mirai_console_version: String by project.ext
|
||||
|
Loading…
Reference in New Issue
Block a user