Commit Graph

389 Commits

Author SHA1 Message Date
Him188
ddb74b9292 Set version to 2.10.0-RC 2021-12-23 01:37:11 +00:00
Him188
7faf630454 Update kotlin-jvm-blocking-bridge to 2.0.0-160.2 2021-12-23 01:37:11 +00:00
Him188
3e28cb57b6 Fix deprecation in buildscripts 2021-12-23 01:37:11 +00:00
Him188
5368e6b809 Upgrade buildscript for Kotlin 1.6.0, use Gradle 7.2 2021-12-23 01:37:11 +00:00
Karlatemp
45e3f58017
Don't apply shadowJar directly
For fix project dependencies
2021-12-22 23:18:56 +08:00
Him188
44b5f70bde Set version to 2.9.0 2021-12-18 17:31:03 +00:00
Karlatemp
6b16fd2580
2.9.0-RC2 2021-12-19 01:15:35 +08:00
Karlatemp
6f55816b08
Use JDK 11 for CI 2021-12-18 17:12:50 +08:00
Him188
92465c3213 Improve performance of IDEA plugin 2021-12-16 14:17:50 +00:00
Him188
aa915085b8 Set version to 2.9.0 2021-12-15 21:16:02 +00:00
Karlatemp
bca536b107
Fix publishing; fix #1733 2021-12-13 13:07:29 +08:00
Him188
18e10c2ceb set version to 2.9.0-RC 2021-12-11 17:12:52 +00:00
Eritque arcus
07b303fb24
upgrade log4j version to prevent vulnerability (#1724) 2021-12-10 11:57:09 +00:00
Him188
1783c22e30 Unify dependency configuration 2021-12-06 14:58:30 +00:00
Him188
61ce69c328 Configure publishing for mirai-bom 2021-12-06 14:31:25 +00:00
微莹·纤绫
d10d20302e
Dokka (#1708)
* dokka

* test

* Fix classpath

* Fix deploy

* Fix deploy

* Fix deploy

* GitHub workflows
2021-12-04 15:43:09 +00:00
Him188
b0c4821a20 Set version on main branch to 2.9.0-M1 2021-11-09 22:12:11 +00:00
Him188
32f2f705a5 Set version on main branch to 2.8.0 2021-10-30 22:56:12 +01:00
Him188
919498c215 Set version to 2.8.0-RC 2021-10-30 22:48:37 +01:00
Him188
66999aadaf Migrate to Kotlin 1.5.30 and review dependencies:
- Remove redundant atomicfu-common
- Do not expose kotlinx-io and atomicfu
2021-09-01 18:52:36 +08:00
Him188
2cc6e0bbd8 Use yamlkt 0.10.2 2021-09-01 13:55:39 +08:00
Him188
edf1bc9a2e Migrate more transformers to NoticeProcessorPipeline 2021-09-01 13:55:39 +08:00
Him188
f90320bd2b
Snapshots publishing (#1465)
* Add snapshots publishing

* fix workflow

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* Create tag on releasing snapshots

* fix

* fix

* fix

* Publish only when tagged `v*`

* MAMOE_TOKEN

* fix

* fix

* Close repository but not publish on release

* Ignore documentations for snapshots publishing

* Update docs for snapshots

* Remove unused newly added files

* Disable all shadow tasks on snapshots publishing

* Remove concurrency limitation for publish-mirai

* fix

* fix

* fix

* Remove publishMiraiCoreArtifactsToMavenLocal
2021-09-01 13:47:02 +08:00
Him188
c0d85f3e9d Set version to 2.8.0-M1 2021-08-31 11:15:43 +08:00
Karlatemp
8ab6a489d0
Remove jcenter 2021-08-27 16:36:50 +08:00
Him188
994893605d Set version to 2.8-M1 2021-08-25 16:07:08 +08:00
Him188
b41ee54f6c Release version 2.7.0 2021-08-25 16:04:09 +08:00
RainChan
06c1652d53
Bypass BC deprecation check on Android (#1481)
Co-authored-by: Karlatemp <karlatemp@vip.qq.com>

Co-authored-by: Karlatemp <karlatemp@vip.qq.com>
2021-08-25 15:07:56 +08:00
Him188
63e0c9837d Release version 2.7-RC 2021-08-11 22:00:05 +08:00
Him188
20a14fc716 Add adapter modules for logging libraries to connect with mirai logger 2021-08-11 15:24:32 +08:00
Him188
5950e9e1e8 Improve logging: use Log4j internally and support markers
Migrate usages of `MiraiLogger.create` to new API
apiDump for new logging
2021-08-11 15:24:32 +08:00
Him188
8ede2cc78f Release version 2.7-M2 2021-07-06 21:50:13 +08:00
Him188
59e60d42ce Update to kotlinx-serialization 1.2.1 and yamlkt 0.10.0 2021-07-02 22:39:56 +08:00
Him188
1a8f51a203 Update idea dependencies 2021-07-02 02:07:07 +08:00
Him188
adc39a93b5 Update copyright 2021-07-02 00:39:10 +08:00
Him188
b9eb654a51 Reformat and cleanup code 2021-07-02 00:39:10 +08:00
Karlatemp
28c2309fbb
Add version info in META-INF/MANIFEST.MF (#1355) 2021-06-23 14:57:34 +08:00
Karlatemp
8a1154a0d7
2.7-M2-dev-1 2021-06-23 11:45:39 +08:00
Him188
f2ca8e1eff Revert "Fix kt compiler errors (#1159)"
This reverts commit b227f719
2021-06-19 23:58:27 +08:00
Him188
006b63e93e Use Kotlin IR compiler 2021-06-19 18:35:53 +08:00
Him188
b767d9ad1b 2.7-M1-dev-6 2021-06-19 01:01:21 +08:00
Him188
19bc781854 Add kotlinx-coroutines-debug to jvmTest 2021-06-08 16:14:23 +08:00
Him188
cf82f96672 Opt-in TestOnly for test 2021-06-07 18:42:46 +08:00
Him188
ba7211a6e4 2.7-M1-dev-5 2021-06-01 13:57:01 +08:00
Him188
e1adaf9315 2.7-M1-dev-4 2021-05-31 16:14:31 +08:00
Karlatemp
49fdc19763 Bump junit to 5.7.2 2021-05-31 00:15:02 +08:00
Him188
bcdff1336b
Kotlin 1.5 and dependencies updates (#1246)
* Kotlin 1.5 and dependencies updates

* Update mirai-console ref

* Use Kotlin 1.5.10

* 2.7-M1-dev-3

* Update console ref
2021-05-27 14:39:13 +08:00
Him188
5e25c0e25b Remove bintray 2021-05-25 12:25:53 +08:00
Him188
58d2081494 Add suppress for ExperimentalSerializationApi 2021-05-09 00:54:48 +08:00
Him188
eb80a4836b Remove all unstable kotlin.Duration usages 2021-05-09 00:54:48 +08:00
Him188
e08fc5d874 Build: add slf4j 2021-05-09 00:54:48 +08:00
Him188
a143340141 Buildscript: Fix test artifacts included in main sourceset 2021-05-09 00:54:48 +08:00
Him188
b844efb072 New network: framework infrastructure 2021-05-09 00:54:48 +08:00
Him188
cb2b0f4423 Release version 2.6.4 2021-05-06 23:41:28 +08:00
Him188
70dc0a4da6
Remove kotlin.time.Duration usages (#1215)
* Remove kotlin.Duration usages

* Fix build

* update submodule console ref
2021-04-27 11:49:30 +08:00
Him188
2dc96999f1 2.7-M1-dev-2 2021-04-25 11:42:29 +08:00
Him188
30a81738b9 2.7-M1-dev-1 2021-04-18 14:39:22 +08:00
Him188
9debb850b7 Release version 2.6.1 2021-04-17 19:09:26 +08:00
Him188
1dce29a154 Release version 2.6.0 2021-04-16 09:01:25 +08:00
Him188
6cd45c7746 Release version 2.6-RC 2021-04-10 20:15:22 +08:00
Karlatemp
0f54e2aa27
Fix https://github.com/mamoe/mirai/pull/1167#discussion_r608537316 (#1174) 2021-04-08 22:22:17 +08:00
Him188
c0d7a90264 Update yamlkt to 0.9.0 2021-04-08 01:48:46 +08:00
Him188
82ec29b311 Make mirai-console compatible with IDEA 2021.1 2021-04-08 01:44:40 +08:00
Him188
e5f0adfd7e build: update intellijGradlePlugin to 0.7.2 and allow using property flatten.sourceset to disable flatten sourceSets 2021-04-06 12:10:29 +08:00
Him188
ece455f79e Unified junit version, update junit to 5.4.2 2021-04-06 00:11:12 +08:00
Karlatemp
b227f719a2
Fix kt compiler errors (#1159)
* Fix kt compiler errors

* Revert "Fix compiler bug, fix #1136"

This reverts commit 39f6c168

* Fix log style

Co-authored-by: Him188 <Him188@mamoe.net>
2021-04-05 22:41:26 +08:00
AdoptOSS
21e8852e0f
buildscript: fix task not found errors when android sdk not available (#1161)
* buildscript: fix task not found errors when android sdk not available

* fix: this shadowed by run

* cleanup: code style

* improve: avoid breaking index map
2021-04-05 22:35:38 +08:00
Him188
45294e1538 Update to 2.6-M2 2021-04-04 19:26:31 +08:00
Him188
30cb70f67f Release version v2.6-M1 2021-03-30 22:14:14 +08:00
Him188
c8e0eccf67 2.5.1-dev-1 2021-03-27 15:41:09 +08:00
Him188
0723c5c568 Release version 2.5.0 2021-03-26 11:48:20 +08:00
Him188
aa1aaf1ada Update serialization version to 1.1.0
Fix unresolved reference on Maven sync due to kotlin-stdlib:1.4.30-370
2021-03-26 10:19:54 +08:00
Him188
474de03e19 Release version 2.5-RC 2021-03-20 22:35:28 +08:00
Karlatemp
f9353b6aef
Compiled code verify (#1080)
* Compiled code verify

* Run `verifyCompiledClasses` in `check` task

* Redesign verification

Co-authored-by: Bo Zhang <bo@gradle.com>

* Disable console verify

* Decoupling

Co-authored-by: Bo Zhang <bo@gradle.com>
2021-03-20 13:34:04 +08:00
Him188
5521bb2eec Add swing dependency to buildSrc for mirai-console-intellij 2021-03-19 23:12:02 +08:00
Him188
eca12954b5 2.5-RC-dev-1 2021-03-19 09:11:37 +08:00
Him188
9d28540073 Update blocking bridge version to 1.10.3, fix NoClassDefFoundError, fix #1078 2021-03-18 12:36:53 +08:00
Him188
7a4d1f2763 Release version 2.5-M2 2021-03-09 09:07:30 +08:00
Him188
e256ec06d3
Support file operations (#1069)
* Proto structs for group file

* RemoteFile fundamental abstraction and proto structs

* Configure JVM target for mirai-console-intellij

* Add Group.filesRoot

* Fix build

* Implement a FileSystem for RemoteFile resolution

* Fix RemoteFile FileSystem and implement resolve and listFiles

* Implement file info query and file download

* Support uploading group file

* Support file feeds

* 2.5-M2-dev-1

* Fix tests

* 2.5-M2-dev-2

* Add uuid-based resolving, support getting file details

* Support FileMessage receive

* Support sending FileMessage

* 2.5-M2-dev-3

* Add DownloadInfo.id

* Improve RemoteFile.delete

* Support move, delete, rename, mkdir. Simplify listFiles

* - Rename RemoteFile.write to .upload.
- Prefer id matching
- Improve move

* Add permission checks

* Improve permission checks

* Rearrange functions and add constant ROOT_PATH

* Introduce FileSupported, add extensions

* Introduce ProgressionCallback

* Fix docs and uploadFileAndSend

* Remove empty FileHighway.kt

* Add test testNormalize

* Add RemoteFile.contact, change RemoteFile.uploadAndSend return type to MessageReceipt

* Move @JvmBlockingBridge to file

* Change FileMessage.toRemoteFile parameter type Group to FileSupported

* Add impl notes #1082
2021-03-08 18:34:45 +08:00
Him188
0183981b63 Release version 2.5-M1 2021-02-27 14:46:36 +08:00
Karlatemp
7b7730601f
Include api-versions.xml in repo 2021-02-26 18:32:44 +08:00
Him188
8c5727800c Release 2.5.0-dev-android-1 2021-02-25 13:11:21 +08:00
Him188
22ab149024 Fix configureJvmTarget 2021-02-25 11:11:28 +08:00
Him188
aaab3ae109 Merge branch 'dev' into android_target
# Conflicts:
#	build.gradle.kts
2021-02-25 10:39:51 +08:00
Him188
cdf2235b7a Fix typo 2021-02-25 09:43:10 +08:00
Karlatemp
7a7c88b783
Android api level check 2021-02-25 00:12:58 +08:00
Him188
95688e37af
Update to Kotlin 1.4.30 and bump other dependencies versions (#1049)
- kotlin-stdlib and compiler 1.4.30
- kotlinx-serialization 1.1.0-RC
- kotlinx-coroutines 1.4.2
- ktor 1.5.1
- atomicfu 0.15.1
- yamlkt 0.9.0
- kotlin-jvm-blocking-bridge 1.10.0
- intellij 2020.3.2
- kotlin-intellij 203-1.4.30-release-IJ7148.5
- Gradle 6.8.2
2021-02-24 12:15:19 +08:00
Him188
0529d7679b Enable android target always 2021-02-24 12:14:02 +08:00
Him188
0b971b2117 Merge branch 'dev' into android_target
# Conflicts:
#	build.gradle.kts
#	buildSrc/src/main/kotlin/Versions.kt
2021-02-24 09:20:47 +08:00
Karlatemp
2eaa13a7c2
Release 2.5.0-dev-2 2021-02-18 01:15:48 +08:00
Karlatemp
6e2ae6b3af
Update caller-finder version 2021-02-15 10:42:37 +08:00
Him188
16e7af43ba Release v2.5.0-dev-1 2021-02-13 17:44:31 +08:00
Him188
c82efff696 Release v2.4-RC 2021-02-11 19:18:11 +08:00
Karlatemp
b3e9e2a91b
Remote repositories name 2021-02-10 10:06:41 +08:00
Karlatemp
32ef89add1
Merge remote-tracking branch 'origin/dev' into maven-central
# Conflicts:
#	.github/workflows/bintray.yml
#	.github/workflows/release.yml
2021-02-10 10:01:07 +08:00
Karlatemp
ff23709ae3
Merge remote-tracking branch 'origin/dev' into maven-central
# Conflicts:
# .github/workflows/bintray.yml
# .github/workflows/release.yml
# buildSrc/src/main/kotlin/Versions.kt
2021-02-08 12:24:15 +08:00
Him188
bdcc92f0e9 Update blocking bridge version 2021-02-08 12:05:38 +08:00
Karlatemp
a0666635d5
Keep JCenter package; Re-enable gradle plugin publish 2021-02-07 15:28:29 +08:00
Him188
bf4502fa3e 2.4-M1 2021-02-07 14:37:03 +08:00
Karlatemp
9d8781d27c
Init keys before project init 2021-02-06 16:38:43 +08:00
Karlatemp
059d6a2ee5
2.4.0-dev-publish-1 2021-02-06 16:31:59 +08:00
Karlatemp
9af889f730
GitHub Workflow 2021-02-06 15:41:09 +08:00
Karlatemp
7eadb1df56
Merge remote-tracking branch 'origin/dev' into maven-central
# Conflicts:
#	buildSrc/src/main/kotlin/Versions.kt
2021-02-06 08:30:32 +08:00
Karlatemp
0750e81b45
Setup sonatype remote 2021-02-06 08:16:29 +08:00
Karlatemp
cd47c60e76
Add the missing values in POM 2021-02-06 08:15:21 +08:00
Him188
502f62167d 2.4.0-dev-1 2021-02-05 23:33:50 +08:00
Karlatemp
ea44735bce
POM file setup 2021-02-05 22:07:35 +08:00
Karlatemp
95d6484ec6
GPG sign 2nd verity 2021-02-05 22:04:37 +08:00
Karlatemp
d37675f5c2
GPG sign for artifacts 2021-02-05 17:38:27 +08:00
Him188
af72c4ec25 2.3.2 2021-02-03 20:24:25 +08:00
Him188
41bbef98ad 2.3.1 2021-02-03 15:49:27 +08:00
Him188
ea895db70c 2.3.0 2021-02-03 13:15:23 +08:00
Him188
bacfef584f Add android compilation target 2021-02-01 12:23:28 +08:00
Karlatemp
374de0609c
2.2.2 2021-01-31 23:09:24 +08:00
Karlatemp
55eed50431
2.2.2-dev-2 2021-01-31 22:08:54 +08:00
Him188
06e58c50a1 2.2.2-dev-1 2021-01-31 15:45:25 +08:00
Him188
08e9f8faf6 2.2.1 2021-01-30 22:00:45 +08:00
Him188
4f17780ac5 - Fix publishing
- Remove root module publication
2021-01-30 20:32:21 +08:00
Him188
f698a7705e Fix publishing 2021-01-30 14:49:33 +08:00
Him188
6c0c69b183 Remove jar files in root module publication 2021-01-29 13:44:20 +08:00
Him188
f291461099 2.2.0 2021-01-29 12:21:52 +08:00
Him188
559d6a7039 Merge remote-tracking branch 'mirai/dev' into dev 2021-01-29 10:23:42 +08:00
Him188
3704604544 Extract ResolveContext and RestrictedScope to separate modules 2021-01-29 07:44:22 +08:00
Karlatemp
b3e62552a4
2.2.0-dev-7 2021-01-28 21:07:38 +08:00
Him188
e4d3a17281 2.2.0-dev-6 2021-01-28 18:52:41 +08:00
Him188
9bfc6ffb4a Fix workflows 2021-01-28 18:21:56 +08:00
Him188
e0476d7e14 Include mirai-console in mirai project build 2021-01-28 09:32:23 +08:00
Him188
f48f73f673 2.2.0-dev-4 2021-01-27 14:02:01 +08:00
Him188
525d7c8de3 Do not publish jvm artifacts in root module, fix unresolved dependency with Android. fix #897 2021-01-27 13:57:32 +08:00
Him188
0bad96dd31 2.2.0-dev-3 2021-01-26 19:33:50 +08:00
Him188
cc87f6833f 2.2.0-dev-2 2021-01-26 19:14:07 +08:00
Him188
d8b1505181
Highway big data channel (#917)
- Fix retryWithServers exception suppress
- ConfigPush BDH session
- ConfigPush SSO change server
- Upload group PTT silk, #577
- Support upload private image through highway, close #194;
- Add fallback strategies for uploading group voice #577 and private image #916
- Upload all resources through highway BDH
- Support concurrent uploading
- Add BotConfiguration.highwayUploadCoroutineCount

close #916, close #577, close #194
2021-01-26 19:08:01 +08:00
Him188
596a295905 2.2.0-dev-1 2021-01-26 00:32:35 +08:00
Him188
c0154603eb 2.1.0 2021-01-24 01:15:20 +08:00
Him188
2e5b223b6a
支持使用QQ互联通道发送音乐分享 (#889)
* Add new MessageContent MusicShare and its protocol internals. #690, #682

* MusicShare sending

* MusicShare: MessageSource integration fundamentals

* - MessageReceipt integration for MusicShare
- Support MusicShare in QuoteReply: transform as PlainText
- Support LightApp refining, support decoding MusicShare

* Dump api for MusicShare

* Remove debugging code

* 2.1.0-dev-3

* Remove confusing providedSequenceIds in OnlineMessageSourceToGroupImpl

* fix build

Co-authored-by: wdvxdr <wdvxdr@foxmail.com>
2021-01-23 22:09:27 +08:00
Him188
705153c7d6 Update blocking bridge to 1.7.4 2021-01-23 15:24:14 +08:00
Him188
46998250a1 2.1.0-dev-2 2021-01-23 03:11:05 +08:00
Him188
f1c6677af9 Add binary compatibility validator 2021-01-21 14:20:43 +08:00
Him188
0a23efa113 Rollback blocking bridge version to 1.6.0 to test binary compatibility 2021-01-21 14:15:45 +08:00
Him188
246f0aa3dd Bump blockingBridge version to 1.7.3 (with JvmOverloads fix) 2021-01-21 10:10:38 +08:00
Him188
d7b7813b63 2.1.0-dev-1 2021-01-21 10:09:27 +08:00
Him188
988794343b Improve buildscript, fix publication 2021-01-21 10:08:21 +08:00
Him188
6250f93408 Update blocking bridge to 1.7.2 2021-01-20 19:25:32 +08:00
Him188
8a745d388c 2.0.0 2021-01-15 17:52:30 +08:00
Him188
713e63ab14 2.0.0-dev-2 2021-01-13 22:02:38 +08:00
Him188
adf17c223f Use new blocking bridge compiler, fix #853. 2.0.0-dev-1 2021-01-13 17:28:59 +08:00
Him188
7d3bcbeb1c Fix dokka 2021-01-12 18:57:42 +08:00
Him188
fe151a90fd 2.0-RC 2021-01-12 18:19:20 +08:00
Him188
47c9286c45 2.0-RC-dev-9 2021-01-11 23:58:38 +08:00
Him188
93fcb566fd Introduce AsyncRecallResult for getting result of recallIn 2021-01-11 18:36:04 +08:00