From 2f7a9cf9d4ceb50ad9895ec0f8207364b14968cf Mon Sep 17 00:00:00 2001 From: Him188 Date: Sat, 18 Jan 2020 21:35:20 +0800 Subject: [PATCH] Add build.gradle --- .../net/mamoe/mirai/plugin/PluginBase.kt | 4 +- .../net/mamoe/mirai/japt/BlockingBot.java | 2 + mirai-plugins/build.gradle | 0 mirai-plugins/image-sender/build.gradle.kts | 43 +++++++++++++++++++ settings.gradle | 3 ++ 5 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 mirai-plugins/build.gradle create mode 100644 mirai-plugins/image-sender/build.gradle.kts diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/plugin/PluginBase.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/plugin/PluginBase.kt index e75037179..81c4f0431 100644 --- a/mirai-console/src/main/kotlin/net/mamoe/mirai/plugin/PluginBase.kt +++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/plugin/PluginBase.kt @@ -7,7 +7,7 @@ import java.net.URL import java.util.jar.JarFile -abstract class PluginBase constructor() { +abstract class PluginBase { val dataFolder by lazy { File(PluginManager.pluginsPath + pluginDescription.name).also { it.mkdir() } } @@ -56,7 +56,7 @@ class PluginDescription( var basePath = "net.mamoe.mirai.PluginMain" var info = "Unknown" var version = "1.0.0" - val depends = mutableListOf(); + val depends = mutableListOf() content.forEach { val line = it.trim() diff --git a/mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingBot.java b/mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingBot.java index b94d6b2b3..dd50312b6 100644 --- a/mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingBot.java +++ b/mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingBot.java @@ -1,4 +1,6 @@ package net.mamoe.mirai.japt; public interface BlockingBot { + + } diff --git a/mirai-plugins/build.gradle b/mirai-plugins/build.gradle new file mode 100644 index 000000000..e69de29bb diff --git a/mirai-plugins/image-sender/build.gradle.kts b/mirai-plugins/image-sender/build.gradle.kts new file mode 100644 index 000000000..43dd8db96 --- /dev/null +++ b/mirai-plugins/image-sender/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + kotlin("jvm") + java +} + +val kotlinVersion: String by rootProject.ext +val atomicFuVersion: String by rootProject.ext +val coroutinesVersion: String by rootProject.ext +val kotlinXIoVersion: String by rootProject.ext +val coroutinesIoVersion: String by rootProject.ext +val serializationVersion: String by rootProject.ext + +val klockVersion: String by rootProject.ext +val ktorVersion: String by rootProject.ext + +kotlin { + sourceSets { + all { + languageSettings.enableLanguageFeature("InlineClasses") + languageSettings.useExperimentalAnnotation("kotlin.Experimental") + } + } +} + +fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$version" + +fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version" + +dependencies { + api(project(":mirai-core")) + api(project(":mirai-console")) + runtimeOnly(files("../mirai-core/build/classes/kotlin/jvm/main")) // classpath is not added correctly by IDE + + api(kotlin("stdlib", kotlinVersion)) + api(kotlinx("io-jvm", kotlinXIoVersion)) + api(kotlinx("io", kotlinXIoVersion)) + api(kotlinx("coroutines-io", coroutinesIoVersion)) + api(kotlinx("coroutines-core", coroutinesVersion)) +} + +tasks.withType() { + options.encoding = "UTF-8" +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 1280fff2e..9081c2b2c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -43,6 +43,8 @@ include(':mirai-api-http') include(':mirai-demos:mirai-demo-1') include(':mirai-demos:mirai-demo-gentleman') include(':mirai-demos') +include(':mirai-plugins') +include(':mirai-plugins:image-sender') def javaVersion = System.getProperty("java.version") if (javaVersion.substring(0, javaVersion.indexOf(".")).toInteger() >= 11) { @@ -53,5 +55,6 @@ if (javaVersion.substring(0, javaVersion.indexOf(".")).toInteger() >= 11) { project(':mirai-demos:mirai-demo-1').projectDir = file('mirai-demos/mirai-demo-1') project(':mirai-demos:mirai-demo-gentleman').projectDir = file('mirai-demos/mirai-demo-gentleman') +project(':mirai-plugins:image-sender').projectDir = file('mirai-plugins/image-sender') enableFeaturePreview('GRADLE_METADATA') \ No newline at end of file