diff --git a/gradle.properties b/gradle.properties index f94f42aab..ac79d2cb9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ed4f40dea..64f0fd9b7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/mirai-console-graphical/build.gradle.kts b/mirai-console-graphical/build.gradle.kts index 24eedf4c2..d8656417b 100644 --- a/mirai-console-graphical/build.gradle.kts +++ b/mirai-console-graphical/build.gradle.kts @@ -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 { diff --git a/mirai-console-terminal/build.gradle.kts b/mirai-console-terminal/build.gradle.kts index 4ced0996a..de9307458 100644 --- a/mirai-console-terminal/build.gradle.kts +++ b/mirai-console-terminal/build.gradle.kts @@ -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 } \ No newline at end of file diff --git a/mirai-console/build.gradle.kts b/mirai-console/build.gradle.kts index be7382cc1..2ae262da1 100644 --- a/mirai-console/build.gradle.kts +++ b/mirai-console/build.gradle.kts @@ -33,21 +33,17 @@ tasks.withType() { } -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