Просмотр исходного кода

improve console it project structs

Karlatemp 3 лет назад
Родитель
Сommit
f69fdb7ac1
19 измененных файлов с 6 добавлено и 3 удалено
  1. 6 3
      mirai-console/backend/integration-test/build.gradle.kts
  2. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/.module-group.txt
  3. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/.nested-module.txt
  4. 0 0
      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
  5. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/src/After211NoNew.kt
  6. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/.nested-module.txt
  7. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/build.gradle.kts
  8. 0 0
      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
  9. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/src/After211.kt
  10. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/.nested-module.txt
  11. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/build.gradle.kts
  12. 0 0
      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
  13. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/src/Before211.kt
  14. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/.nested-module.txt
  15. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin
  16. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/src/P.kt
  17. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/.nested-module.txt
  18. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin
  19. 0 0
      mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/src/P.kt

+ 6 - 3
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>("jar")
-            subplugins.add(tk)
-            mcit_test.configure { dependsOn(tk) }
+            runCatching {
+                val tk = tasks.named<Jar>("jar")
+                subplugins.add(tk)
+                mcit_test.configure { dependsOn(tk) }
+            }
         }
     }
 }

+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/.module-group.txt


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/.nested-module.txt


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-jar-after-2_11-without-new/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin → 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


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-jar-after-2_11-without-new/src/After211NoNew.kt → mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11-without-new/src/After211NoNew.kt


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/.nested-module.txt


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-jar-after-2_11/build.gradle.kts → mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/build.gradle.kts


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-jar-after-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin → 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


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-jar-after-2_11/src/After211.kt → mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-after-2_11/src/After211.kt


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/.nested-module.txt


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-jar-before-2_11/build.gradle.kts → mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/build.gradle.kts


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-jar-before-2_11/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin → 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


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-jar-before-2_11/src/Before211.kt → mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/mirai-jar-before-2_11/src/Before211.kt


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/.nested-module.txt


+ 0 - 0
mirai-console/backend/integration-test/testers/same-pkg-1/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin → mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin


+ 0 - 0
mirai-console/backend/integration-test/testers/same-pkg-1/src/P.kt → mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-1/src/P.kt


+ 0 - 0
mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/.nested-module.txt


+ 0 - 0
mirai-console/backend/integration-test/testers/same-pkg-2/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin → mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin


+ 0 - 0
mirai-console/backend/integration-test/testers/same-pkg-2/src/P.kt → mirai-console/backend/integration-test/testers/mirai-plugin-compatibility/same-pkg-2/src/P.kt