From b0041d7d9da4eb096e05be7f9e41399f025a7723 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Sun, 22 Nov 2020 10:58:45 +0800
Subject: [PATCH] =?UTF-8?q?[Fix][Add][Dependency]=20Framework-Mirai=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A1=86=E6=9E=B6=E6=8F=8F=E8=BF=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E8=A7=84=E8=8C=83=E9=94=99=E8=AF=AF,=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20package=20=E6=89=93=E5=8C=85=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Fix] framework.json 修复描述文件对必须版本要求(requiresVersion)的规范错误;
[Add][Dependency] Framework-Mirai/pom.xml 添加 maven-assembly-plugin 插件以打包所需依赖项(模块是单独的, 并非与其他模块一起打包);
---
 ContentGrabbingJi-framework-mirai/pom.xml     | 25 +++++++++++++++++++
 .../src/main/resources/framework.json         |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/ContentGrabbingJi-framework-mirai/pom.xml b/ContentGrabbingJi-framework-mirai/pom.xml
index fcb968c..60400a0 100644
--- a/ContentGrabbingJi-framework-mirai/pom.xml
+++ b/ContentGrabbingJi-framework-mirai/pom.xml
@@ -42,6 +42,31 @@
         </repository>
     </repositories>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.3.0</version>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>net.lamgc</groupId>
diff --git a/ContentGrabbingJi-framework-mirai/src/main/resources/framework.json b/ContentGrabbingJi-framework-mirai/src/main/resources/framework.json
index b17343f..08310c4 100644
--- a/ContentGrabbingJi-framework-mirai/src/main/resources/framework.json
+++ b/ContentGrabbingJi-framework-mirai/src/main/resources/framework.json
@@ -2,7 +2,7 @@
   "id": "cgj-mirai",
   "description": "ContentGrabbingJi官方实现的, 基于 Mirai 框架的QQ平台组件",
   "version": "3.0.0-alpha",
-  "requiresVersion": "=>3.0.0",
+  "requiresVersion": "3.0.0",
   "provider": "Github@LamGC, Github@mamoe",
   "license": "AGPL-3.0",
   "frameworkClass": "net.lamgc.cgj.bot.framework.mirai.MiraiMain",