diff --git a/build.gradle.kts b/build.gradle.kts index 7a87013..10ffe91 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ plugins { - kotlin("jvm") version Versions.kotlin - kotlin("plugin.serialization") version Versions.kotlin + kotlin("jvm") version "1.6.0" + kotlin("plugin.serialization") version "1.6.0" - id("net.mamoe.mirai-console") version Versions.mirai + id("net.mamoe.mirai-console") version "2.10.0-RC2" id("net.mamoe.maven-central-publish") version "0.7.1" } @@ -36,30 +36,23 @@ kotlin { dependencies { // implementation(ktor("client-serialization", Versions.ktor)) - implementation(ktor("client-encoding", Versions.ktor)) { + implementation("io.ktor:ktor-client-encoding:1.6.5") { + exclude(group = "org.jetbrains.kotlin") + exclude(group = "org.jetbrains.kotlinx") + exclude(group = "org.slf4j") exclude(group = "io.ktor", module = "ktor-client-core") } implementation("org.jclarion:image4j:0.7") implementation("org.apache.commons:commons-text:1.9") + compileOnly("net.mamoe:mirai-core-utils:${mirai.coreVersion}") testImplementation("net.mamoe.yamlkt:yamlkt-jvm:0.10.2") - testImplementation(kotlin("test", "1.5.31")) + testImplementation(kotlin("test", "1.6.0")) } mirai { configureShadow { - exclude { - it.path.startsWith("kotlin") - } - exclude { - it.path.startsWith("org/intellij") - } - exclude { - it.path.startsWith("org/jetbrains") - } - exclude { - it.path.startsWith("org/slf4j") - } + exclude("module-info.class") } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index f1b6c84..0000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,15 +0,0 @@ - - -plugins { - `kotlin-dsl` -} - -repositories { - mavenLocal() - maven(url = "https://maven.aliyun.com/repository/releases") - maven(url = "https://maven.aliyun.com/repository/public") - mavenCentral() - jcenter() - maven(url = "https://maven.aliyun.com/repository/gradle-plugin") - gradlePluginPortal() -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Dependency.kt b/buildSrc/src/main/kotlin/Dependency.kt deleted file mode 100644 index a1ece3a..0000000 --- a/buildSrc/src/main/kotlin/Dependency.kt +++ /dev/null @@ -1,11 +0,0 @@ -@file:Suppress("unused") - -import org.gradle.api.artifacts.dsl.DependencyHandler - -fun DependencyHandler.kotlinx(module: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$module:$version" - -fun DependencyHandler.ktor(module: String, version: String) = "io.ktor:ktor-$module:$version" - -fun DependencyHandler.mirai(module: String, version: String) = "net.mamoe:mirai-$module:$version" - -fun DependencyHandler.junit(module: String, version: String) = "org.junit.jupiter:junit-jupiter-${module}:${version}" \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt deleted file mode 100644 index f31a1c7..0000000 --- a/buildSrc/src/main/kotlin/Versions.kt +++ /dev/null @@ -1,9 +0,0 @@ - - -object Versions { - // mirai - const val mirai = "2.9.0-M1" - // kotlin - const val kotlin = "1.5.31" - const val ktor = "1.5.4" -} \ No newline at end of file diff --git a/src/main/kotlin/xyz/cssxsh/mirai/plugin/WeiboHelperPlugin.kt b/src/main/kotlin/xyz/cssxsh/mirai/plugin/WeiboHelperPlugin.kt index a0e6d96..02630d1 100644 --- a/src/main/kotlin/xyz/cssxsh/mirai/plugin/WeiboHelperPlugin.kt +++ b/src/main/kotlin/xyz/cssxsh/mirai/plugin/WeiboHelperPlugin.kt @@ -3,9 +3,7 @@ package xyz.cssxsh.mirai.plugin import kotlinx.coroutines.* import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register import net.mamoe.mirai.console.command.CommandManager.INSTANCE.unregister -import net.mamoe.mirai.console.data.* import net.mamoe.mirai.console.plugin.jvm.* -import net.mamoe.mirai.console.util.* import net.mamoe.mirai.event.events.* import net.mamoe.mirai.event.* import net.mamoe.mirai.utils.* @@ -22,9 +20,6 @@ object WeiboHelperPlugin : KotlinPlugin( private var restore: Job? = null - @OptIn(ConsoleExperimentalApi::class) - private fun T.save() = loader.configStorage.store(this@WeiboHelperPlugin, this) - override fun onEnable() { WeiboTaskData.reload() WeiboHelperSettings.reload() diff --git a/src/main/kotlin/xyz/cssxsh/mirai/plugin/WeiboSubscriber.kt b/src/main/kotlin/xyz/cssxsh/mirai/plugin/WeiboSubscriber.kt index ccb90ec..4851fcc 100644 --- a/src/main/kotlin/xyz/cssxsh/mirai/plugin/WeiboSubscriber.kt +++ b/src/main/kotlin/xyz/cssxsh/mirai/plugin/WeiboSubscriber.kt @@ -2,8 +2,6 @@ package xyz.cssxsh.mirai.plugin import kotlinx.coroutines.* import kotlinx.serialization.* -import net.mamoe.mirai.console.util.* -import net.mamoe.mirai.console.util.CoroutineScopeUtils.childScope import net.mamoe.mirai.contact.* import net.mamoe.mirai.message.data.* import net.mamoe.mirai.utils.* @@ -14,7 +12,6 @@ import xyz.cssxsh.weibo.api.* import java.net.UnknownHostException import java.time.* -@OptIn(ConsoleExperimentalApi::class) abstract class WeiboSubscriber>(val type: String) : CoroutineScope by WeiboHelperPlugin.childScope("WeiboListener-$type") {