Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
5fee62f2
Commit
5fee62f2
authored
Feb 16, 2020
by
jiahua.liu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
e8854d83
ac5b1487
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
14 deletions
+21
-14
gradle/publish.gradle
gradle/publish.gradle
+7
-3
mirai-api-http/README_CH.md
mirai-api-http/README_CH.md
+6
-5
mirai-console/build.gradle.kts
mirai-console/build.gradle.kts
+2
-0
mirai-core-qqandroid/build.gradle.kts
mirai-core-qqandroid/build.gradle.kts
+3
-3
mirai-core/build.gradle.kts
mirai-core/build.gradle.kts
+3
-1
mirai-core/src/main/AndroidManifest.xml
mirai-core/src/main/AndroidManifest.xml
+0
-2
No files found.
gradle/publish.gradle
View file @
5fee62f2
...
...
@@ -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)
...
...
mirai-api-http/README_CH.md
View file @
5fee62f2
...
...
@@ -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
...
...
mirai-console/build.gradle.kts
View file @
5fee62f2
...
...
@@ -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
mirai-core-qqandroid/build.gradle.kts
View file @
5fee62f2
...
...
@@ -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"
))
mirai-core/build.gradle.kts
View file @
5fee62f2
...
...
@@ -149,4 +149,6 @@ kotlin {
}
}
}
}
\ No newline at end of file
}
apply
(
from
=
rootProject
.
file
(
"gradle/publish.gradle"
))
mirai-core/src/main/AndroidManifest.xml
View file @
5fee62f2
...
...
@@ -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>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment