diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 45c9c6043..f6fe1515b 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -65,12 +65,16 @@ bintrayUpload.dependsOn { list } +try{ // empty xxx-javadoc.jar -task javadocJar(type: Jar) { - archiveClassifier = 'javadoc' -} + task javadocJar(type: Jar) { + archiveClassifier = 'javadoc' + } +} catch (Exception e){ + +} publishing { publications.all { // add empty javadocs (no need for MPP root publication which publishes only pom file) diff --git a/mirai-api-http/README_CH.md b/mirai-api-http/README_CH.md index 8fd0da5f1..d056170e4 100644 --- a/mirai-api-http/README_CH.md +++ b/mirai-api-http/README_CH.md @@ -461,14 +461,15 @@ Content-Type:multipart/form-data ```json5 { - "type": "Image" - // 暂时不支持Image + "type": "Image", + "imageId": "{01E9451B-70ED-EAE3-B37C-101F1EEBF5B5}.png" //群图片格式 + "imageId": "/f8f1ab55-bf8e-4236-b55e-955848d7069f" //好友图片格式 } ``` -| 名字 | 类型 | 说明 | -| ---- | ---- | ---- | -| | | | +| 名字 | 类型 | 说明 | +| ------- | ------ | --------------------------------------- | +| imageId | String | 图片的imageId,群图片与好友图片格式不同 | #### Xml diff --git a/mirai-console/build.gradle.kts b/mirai-console/build.gradle.kts index c2ef4d870..af0a2a9b0 100644 --- a/mirai-console/build.gradle.kts +++ b/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 } \ No newline at end of file diff --git a/mirai-core-qqandroid/build.gradle.kts b/mirai-core-qqandroid/build.gradle.kts index 017efc5b3..eb5a1af42 100644 --- a/mirai-core-qqandroid/build.gradle.kts +++ b/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 { } } } -} \ No newline at end of file +} + +apply(from = rootProject.file("gradle/publish.gradle")) diff --git a/mirai-core/build.gradle.kts b/mirai-core/build.gradle.kts index 91dcd9de4..882ecf7cc 100644 --- a/mirai-core/build.gradle.kts +++ b/mirai-core/build.gradle.kts @@ -149,4 +149,6 @@ kotlin { } } } -} \ No newline at end of file +} + +apply(from = rootProject.file("gradle/publish.gradle")) diff --git a/mirai-core/src/main/AndroidManifest.xml b/mirai-core/src/main/AndroidManifest.xml index 576ac07c9..544a92e64 100644 --- a/mirai-core/src/main/AndroidManifest.xml +++ b/mirai-core/src/main/AndroidManifest.xml @@ -2,6 +2,4 @@ - - \ No newline at end of file