Commit Graph

4329 Commits

Author SHA1 Message Date
Him188
73b807dd0c Use ANDROID_PHONE by default, close #632 2020-12-01 12:45:15 +08:00
Him188
a7416704b6 Fix jvm method events 2020-12-01 12:44:34 +08:00
Him188
66ec1ab76a Fix ambiguous DefaultLoginSolver 2020-12-01 12:43:04 +08:00
Him188
5d04017666 Add StandardUtils 2020-12-01 12:42:42 +08:00
Him188
b55893ccb1 Simplify files 2020-12-01 12:38:02 +08:00
Him188
3910044490 Remove @SinceMirai 2020-12-01 12:30:13 +08:00
Him188
16c3e02521 Remove Context
Simplify BotFactory
2020-12-01 12:27:35 +08:00
Him188
66464b87fd Simplify platform structure: merge jvmMain into commonMain 2020-12-01 12:13:43 +08:00
Him188
c030155505 Fix -all publish 2020-11-30 23:31:07 +08:00
Him188
eafca6d4ed Simplify platform structure: merge jvmMain into commonMain 2020-11-30 23:30:57 +08:00
Him188
d0d73d5285 Fix MiraiImpl resolve 2020-11-22 14:51:39 +08:00
Him188
641396224e Fix build 2020-11-22 14:45:03 +08:00
Him188
64b5251779 Move service to common resources 2020-11-22 14:33:18 +08:00
Him188
b8002d4b4d Hierarchical MPP:
- JDK in common target
- Disabled common compilations
- Android targets
- Kotlin 1.4.20
2020-11-22 14:25:49 +08:00
Him188
7bf8775261 Update buildscript 2020-11-22 11:57:53 +08:00
Him188
bbda068e78 Update buildscript 2020-11-22 11:57:47 +08:00
Him188
a3c2a29981 Update dependencies 2020-11-22 11:56:54 +08:00
Karlatemp
f4b99367bb
Add the missing ByteArray.toExternalImage 2020-11-15 00:00:03 +08:00
Karlatemp
525830739c
Fix ReusableInput resources releasing
fix #675
2020-11-14 12:06:47 +08:00
Karlatemp
0ebffb735d
Fix PlatformLogger stack trace encoding 2020-11-07 14:23:56 +08:00
Him188
3adcd422c9 Merge remote-tracking branch 'origin/dev' into dev 2020-11-07 12:21:11 +08:00
Him188
7c2f2bb870 Rename Mirai to IMirai, introduce top-level property Mirai to hold lazy instance. Fix build. 2020-11-07 12:21:03 +08:00
Him188
f1e8fbfce5
Merge pull request #669 from hiiragiyuriko/patch-1
README: 修复失效链接
2020-11-03 11:20:10 +08:00
柊 ゆり子
c436082ac3
README: 修复失效链接 2020-11-03 10:49:14 +08:00
Him188
efdf68a553 Fix tests 2020-11-01 23:57:37 +08:00
Him188
9e6b16c3e5 Fix findMiraiInstance 2020-11-01 23:54:49 +08:00
Him188
17eeb56a76 Fix build 2020-11-01 23:48:26 +08:00
Him188
6391955459 Merge remote-tracking branch 'origin/dev' into dev 2020-11-01 15:16:33 +08:00
Him188
1e7aaaec48 Rearrange protocol implementations 2020-11-01 15:07:32 +08:00
AdoptOSS
fd5b0251d0
Use emptyList() as the default value of List<*> for ProtoBuf (#666) 2020-11-01 08:30:30 +08:00
Karlatemp
75f3f9de93
Review remark
- Change DeprecationLevel of FriendRemarkChangeEvent.newName to ERROR
- Simplify logic
2020-10-29 12:51:45 +08:00
Karlatemp
d1d5435e99
remark 2020-10-28 12:43:28 +08:00
Karlatemp
14e3ddf8d6
Remark support 2020-10-28 12:33:17 +08:00
Karlatemp
d3f6b3ce33
Merge branch 'remark' into dev
# Conflicts:
#	mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt
2020-10-28 11:46:02 +08:00
AdoptOSS
bb3d039bf8
Simplify DeviceInfo (#655)
* Simplify DeviceInfo

* Place random string helper properly

* Make DeviceInfo::random java-friendly
2020-10-27 08:57:28 +08:00
Him188
54df8d63aa Set JVM target 1.8 2020-10-25 12:31:34 +08:00
Him188
f7c7452484 Set JVM target 1.8 2020-10-25 12:31:16 +08:00
Him188
7bf701630e Gradle 6.7 2020-10-25 12:26:53 +08:00
Karlatemp
6b7365d24c
Merge branch '1.x' into dev
# Conflicts:
#	buildSrc/src/main/kotlin/Versions.kt
2020-10-04 10:13:37 +08:00
Karlatemp
e6c90f0edf
1.3.2 2020-10-04 10:04:01 +08:00
Karlatemp
26fdf6b22d
Merge remote-tracking branch 'origin/dev' into 1.x
# Conflicts:
#	build.gradle.kts
#	mirai-core-api/src/commonMain/kotlin/event/events/bot.kt
#	mirai-core-api/src/commonMain/kotlin/event/events/friend.kt
2020-10-03 22:15:52 +08:00
Karlatemp
c1f609d0de
Nugde stability update 2020-10-03 22:12:49 +08:00
Karlatemp
16623aec65
Remove md5 2020-10-03 21:27:18 +08:00
Karlatemp
19254df0e1
Fix packet processing order 2020-10-03 21:10:03 +08:00
Him188
0477ed94e8 Fix tests 2020-10-03 13:47:36 +08:00
Him188
0d96ea53d0 Fix build 2020-10-03 13:44:19 +08:00
Him188
80722aaea7 Pretty buildscript 2020-10-03 13:35:05 +08:00
Him188
a9d4d14576 Rearrange module structure:
- Rename mirai-core to mirai-core-api
- Rename mirai-core-qqandroid to mirai-core
- Rename package net.mamoe.mirai.qqandroid to net.mamoe.mirai.internal
- Delete old android targets
- Configure default packages correctly
- Update licenses
2020-10-03 12:42:13 +08:00
Him188
fb2f437a21 Merge remote-tracking branch 'origin/dev' into dev 2020-10-03 12:09:12 +08:00
Him188
32705d9920 Remove JvmBlockingBridge on Image.queryUrl 2020-10-03 12:08:57 +08:00