Merge remote-tracking branch 'origin/master'

gradle/publish.gradle

@@ -65,12 +65,16 @@ bintrayUpload.dependsOn {
     list
 }
 
+try{
 
 // empty xxx-javadoc.jar
-task javadocJar(type: Jar) {
+    task javadocJar(type: Jar) {
-    archiveClassifier = 'javadoc'
+        archiveClassifier = 'javadoc'
-}
+    }
 
+} catch (Exception e){
+
+}
 publishing {
     publications.all {
         // add empty javadocs (no need for MPP root publication which publishes only pom file)

mirai-api-http/README_CH.md

@@ -461,14 +461,15 @@ Content-Type：multipart/form-data
 
 ```json5
 {
-    "type": "Image"
+    "type": "Image",
-    // 暂时不支持Image
+    "imageId": "{01E9451B-70ED-EAE3-B37C-101F1EEBF5B5}.png" //群图片格式
+    "imageId": "/f8f1ab55-bf8e-4236-b55e-955848d7069f"      //好友图片格式
 }
 ```
 
-| 名字 | 类型 | 说明 |
+| 名字    | 类型   | 说明                                    |
-| ---- | ---- | ---- |
+| ------- | ------ | --------------------------------------- |
-|      |      |      |
+| imageId | String | 图片的imageId，群图片与好友图片格式不同 |
 
 #### Xml
 

mirai-console/build.gradle.kts

@@ -43,5 +43,7 @@ dependencies {
     api(group = "com.moandjiezana.toml", name = "toml4j", version = "0.7.2")
     api(group = "com.googlecode.lanterna", name = "lanterna", version = "3.0.2")
     api("org.bouncycastle:bcprov-jdk15on:1.64")
+
+    implementation("no.tornado:tornadofx:1.7.17")
     // classpath is not set correctly by IDE
 }

mirai-core-qqandroid/build.gradle.kts

@@ -8,8 +8,6 @@ plugins {
     id("com.jfrog.bintray") version "1.8.4-jetbrains-3"
 }
 
-apply(from = rootProject.file("gradle/publish.gradle"))
-
 val kotlinVersion: String by rootProject.ext
 val atomicFuVersion: String by rootProject.ext
 val coroutinesVersion: String by rootProject.ext
@@ -119,4 +117,6 @@ kotlin {
             }
         }
     }
-}
+}
+
+apply(from = rootProject.file("gradle/publish.gradle"))

mirai-core/build.gradle.kts

@@ -149,4 +149,6 @@ kotlin {
             }
         }
     }
-}
+}
+
+apply(from = rootProject.file("gradle/publish.gradle"))

mirai-core/src/main/AndroidManifest.xml

@@ -2,6 +2,4 @@
 <manifest package="net.mamoe.mirai" xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 </manifest>