From f69fdb7ac12b163d9d082dfa1c5c8cba9e6e8b6e Mon Sep 17 00:00:00 2001 From: Karlatemp Date: Wed, 22 Jun 2022 17:14:21 +0800 Subject: [PATCH] improve console it project structs --- mirai-console/backend/integration-test/build.gradle.kts | 9 ++++++--- .../testers/mirai-plugin-compatibility/.module-group.txt | 0 .../mirai-jar-after-2_11-without-new/.nested-module.txt | 0 .../net.mamoe.mirai.console.plugin.jvm.JvmPlugin | 0 .../src/After211NoNew.kt | 0 .../mirai-jar-after-2_11/.nested-module.txt | 0 .../mirai-jar-after-2_11/build.gradle.kts | 0 .../net.mamoe.mirai.console.plugin.jvm.JvmPlugin | 0 .../mirai-jar-after-2_11/src/After211.kt | 0 .../mirai-jar-before-2_11/.nested-module.txt | 0 .../mirai-jar-before-2_11/build.gradle.kts | 0 .../net.mamoe.mirai.console.plugin.jvm.JvmPlugin | 0 .../mirai-jar-before-2_11/src/Before211.kt | 0 .../same-pkg-1/.nested-module.txt | 0 .../net.mamoe.mirai.console.plugin.jvm.JvmPlugin | 0 .../{ => mirai-plugin-compatibility}/same-pkg-1/src/P.kt | 0 .../same-pkg-2/.nested-module.txt | 0 .../net.mamoe.mirai.console.plugin.jvm.JvmPlugin | 0 .../{ => mirai-plugin-compatibility}/same-pkg-2/src/P.kt | 0 19 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/.module-group.txt create mode 100644 mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/.nested-module.txt rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/mirai-jar-after-2_11-without-new/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin (100%) rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/mirai-jar-after-2_11-without-new/src/After211NoNew.kt (100%) create mode 100644 mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/.nested-module.txt rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/mirai-jar-after-2_11/build.gradle.kts (100%) rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/mirai-jar-after-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin (100%) rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/mirai-jar-after-2_11/src/After211.kt (100%) create mode 100644 mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/.nested-module.txt rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/mirai-jar-before-2_11/build.gradle.kts (100%) rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/mirai-jar-before-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin (100%) rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/mirai-jar-before-2_11/src/Before211.kt (100%) create mode 100644 mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/.nested-module.txt rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/same-pkg-1/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin (100%) rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/same-pkg-1/src/P.kt (100%) create mode 100644 mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/.nested-module.txt rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/same-pkg-2/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin (100%) rename mirai-console/backend/integration-test/testers/{ => mirai-plugin-compatibility}/same-pkg-2/src/P.kt (100%) diff --git a/mirai-console/backend/integration-test/build.gradle.kts b/mirai-console/backend/integration-test/build.gradle.kts index b9d775bb8..038a70f94 100644 --- a/mirai-console/backend/integration-test/build.gradle.kts +++ b/mirai-console/backend/integration-test/build.gradle.kts @@ -94,10 +94,13 @@ mcit_test.configure { val crtProject = project allprojects { if (project != crtProject) { + if (project.file(".module-group.txt").exists()) return@allprojects project.afterEvaluate { - val tk = tasks.named("jar") - subplugins.add(tk) - mcit_test.configure { dependsOn(tk) } + runCatching { + val tk = tasks.named("jar") + subplugins.add(tk) + mcit_test.configure { dependsOn(tk) } + } } } } diff --git a/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/.module-group.txt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/.module-group.txt new file mode 100644 index 000000000..e69de29bb diff --git a/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/.nested-module.txt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/.nested-module.txt new file mode 100644 index 000000000..e69de29bb diff --git a/mirai-console/backend/integration-test/testers/mirai-jar-after-2_11-without-new/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin similarity index 100% rename from mirai-console/backend/integration-test/testers/mirai-jar-after-2_11-without-new/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin diff --git a/mirai-console/backend/integration-test/testers/mirai-jar-after-2_11-without-new/src/After211NoNew.kt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/src/After211NoNew.kt similarity index 100% rename from mirai-console/backend/integration-test/testers/mirai-jar-after-2_11-without-new/src/After211NoNew.kt rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/src/After211NoNew.kt diff --git a/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/.nested-module.txt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/.nested-module.txt new file mode 100644 index 000000000..e69de29bb diff --git a/mirai-console/backend/integration-test/testers/mirai-jar-after-2_11/build.gradle.kts b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/build.gradle.kts similarity index 100% rename from mirai-console/backend/integration-test/testers/mirai-jar-after-2_11/build.gradle.kts rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/build.gradle.kts diff --git a/mirai-console/backend/integration-test/testers/mirai-jar-after-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin similarity index 100% rename from mirai-console/backend/integration-test/testers/mirai-jar-after-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin diff --git a/mirai-console/backend/integration-test/testers/mirai-jar-after-2_11/src/After211.kt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/src/After211.kt similarity index 100% rename from mirai-console/backend/integration-test/testers/mirai-jar-after-2_11/src/After211.kt rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/src/After211.kt diff --git a/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/.nested-module.txt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/.nested-module.txt new file mode 100644 index 000000000..e69de29bb diff --git a/mirai-console/backend/integration-test/testers/mirai-jar-before-2_11/build.gradle.kts b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/build.gradle.kts similarity index 100% rename from mirai-console/backend/integration-test/testers/mirai-jar-before-2_11/build.gradle.kts rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/build.gradle.kts diff --git a/mirai-console/backend/integration-test/testers/mirai-jar-before-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin similarity index 100% rename from mirai-console/backend/integration-test/testers/mirai-jar-before-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin diff --git a/mirai-console/backend/integration-test/testers/mirai-jar-before-2_11/src/Before211.kt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/src/Before211.kt similarity index 100% rename from mirai-console/backend/integration-test/testers/mirai-jar-before-2_11/src/Before211.kt rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/src/Before211.kt diff --git a/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/.nested-module.txt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/.nested-module.txt new file mode 100644 index 000000000..e69de29bb diff --git a/mirai-console/backend/integration-test/testers/same-pkg-1/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin similarity index 100% rename from mirai-console/backend/integration-test/testers/same-pkg-1/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin diff --git a/mirai-console/backend/integration-test/testers/same-pkg-1/src/P.kt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/src/P.kt similarity index 100% rename from mirai-console/backend/integration-test/testers/same-pkg-1/src/P.kt rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/src/P.kt diff --git a/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/.nested-module.txt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/.nested-module.txt new file mode 100644 index 000000000..e69de29bb diff --git a/mirai-console/backend/integration-test/testers/same-pkg-2/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin similarity index 100% rename from mirai-console/backend/integration-test/testers/same-pkg-2/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin diff --git a/mirai-console/backend/integration-test/testers/same-pkg-2/src/P.kt b/mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/src/P.kt similarity index 100% rename from mirai-console/backend/integration-test/testers/same-pkg-2/src/P.kt rename to mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/src/P.kt