Him188
|
e04650538a
|
Update versions of kotlinx.serialization, atomicfu, kotlinx.coroutines
|
2020-03-08 18:06:33 +08:00 |
|
Him188
|
e39fe5a46f
|
Merge branch 'master' into kotlin-1.3.70
# Conflicts:
# mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidClient.kt
# mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
# mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt
# mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/WtLogin.kt
# mirai-core/build.gradle.kts
# mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt
# mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt
# mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/channels.kt
# mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/chunked.kt
# mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/input.kt
# mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt
|
2020-03-08 00:29:51 +08:00 |
|
Him188
|
61ca490b5d
|
Rearrange dependencies
|
2020-03-07 22:23:10 +08:00 |
|
Him188
|
d01c3c4675
|
Support optional elements
|
2020-03-06 17:51:48 +08:00 |
|
Him188
|
03e22bcfef
|
Replace mirai_version with miraiVersion
|
2020-03-01 13:01:36 +08:00 |
|
Him188
|
6496c76a4d
|
Use build.gradle.kts
|
2020-03-01 13:00:34 +08:00 |
|