From 8aae12e570a5b6997bebf291111b614ae0de6c99 Mon Sep 17 00:00:00 2001 From: xiaoyv404 Date: Sat, 11 Jun 2022 11:33:13 +0800 Subject: [PATCH 1/3] Use mirai 2.11.1 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e5b85e7..310476f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { kotlin("jvm") version kotlinVersion kotlin("plugin.serialization") version kotlinVersion - id("net.mamoe.mirai-console") version "2.0-RC" + id("net.mamoe.mirai-console") version "2.11.1" } group = "net.mamoe" From 5863c29585faf602dd98c7cb30689fdf2967ab6c Mon Sep 17 00:00:00 2001 From: xiaoyv404 Date: Sat, 11 Jun 2022 21:44:57 +0800 Subject: [PATCH 2/3] Use kotlin 1.6.10 gradle 7.4.2 --- build.gradle.kts | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 310476f..eeb7eb8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - val kotlinVersion = "1.4.21" + val kotlinVersion = "1.6.10" kotlin("jvm") version kotlinVersion kotlin("plugin.serialization") version kotlinVersion @@ -19,10 +19,10 @@ mirai { repositories { mavenLocal() - jcenter() + maven("https://maven.aliyun.com/repository/public") // 阿里云国内代理仓库 } -kotlin.sourceSets.forEach { it.languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn") } +kotlin.sourceSets.forEach { it.languageSettings.optIn("kotlin.RequiresOptIn") } tasks.create("buildCiJar", Jar::class) { dependsOn("buildPlugin") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 14e30f7..1b60b90 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-7.4.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 3f1c9b4a19587000a4faddd90a89759f0007713f Mon Sep 17 00:00:00 2001 From: xiaoyv404 Date: Sat, 11 Jun 2022 22:34:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- settings.gradle.kts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index eeb7eb8..fb6ee66 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,7 +19,7 @@ mirai { repositories { mavenLocal() - maven("https://maven.aliyun.com/repository/public") // 阿里云国内代理仓库 + mavenCentral() } kotlin.sourceSets.forEach { it.languageSettings.optIn("kotlin.RequiresOptIn") } diff --git a/settings.gradle.kts b/settings.gradle.kts index 47c2168..b0556e0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,7 +3,6 @@ pluginManagement { mavenLocal() gradlePluginPortal() mavenCentral() - jcenter() maven("https://dl.bintray.com/kotlin/kotlin-eap") } }