Commit Graph

40 Commits

Author SHA1 Message Date
Him188
b175119f0f Merge branch 'master' into dev
# Conflicts:
#	buildSrc/src/main/kotlin/Versions.kt
#	gradle.properties
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt
#	mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/LoginFailedException.kt
#	mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/JvmMethodListeners.kt
#	mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/retryCatching.jvm.kt
#	settings.gradle
2020-08-16 01:57:07 +08:00
Him188
87e76d4890 Update Kotlin version to 1.4 and relevant libraries 2020-07-31 16:29:25 +08:00
Him188
35336a0ae7 Fix buildscript 2020-07-30 00:28:09 +08:00
Him188
719b5ac7b5 Explicit api mode 2020-07-20 15:06:30 +08:00
Karlatemp
22550cafd2
Create java test. Fix #443 (#446)
* Create java test. Fix #443

* Typo

* gradle-kotlin-dsl
2020-07-17 20:43:26 +08:00
Him188
094bd72efb Add String.parserMiraiCode, close #264 2020-05-29 17:09:20 +08:00
Him188
15527b56d8 Add compatibility tests 2020-04-22 13:54:50 +08:00
Him188
6af75c02f7 NO MORE FUCKING ANDROID TARGET 2020-04-10 16:13:03 +08:00
Him188
f95a11a248 Add module 'compatibility-validator' 2020-03-22 14:25:15 +08:00
Him188
197bf2e2dd Cleanup 2020-02-28 08:56:27 +08:00
Him188
12ad754294 Separate mirai-demos series from main repository 2020-02-27 13:50:27 +08:00
Him188
c6ae8e32c2 Separate mirai-console series from main repository 2020-02-27 13:30:15 +08:00
Him188
cc821d0b4a Fix tips 2020-02-18 12:10:38 +08:00
Him188
2e70218c1a Set jfx properly 2020-02-18 11:45:57 +08:00
ryoii
4dca64a491 init console-x 2020-02-16 14:35:41 +08:00
Him188
25b3b2b2be Japt 2020-02-15 15:03:52 +08:00
jasonczc
f6155cc6a5 Fix gradle build 2020-02-13 21:11:00 +08:00
jasonczc
8fcdad653a Fix gradle on java-oracle 2020-02-13 00:06:03 +08:00
Him188
550d781f8d ignore mirai-debug if jdk version detection fails 2020-02-12 23:41:19 +08:00
Him188
59e2ed85d3 Catch exceptions thrown in settings 2020-02-12 23:30:28 +08:00
Him188
73cda9dfe5 Remove TIMPC 2020-02-02 23:20:34 +08:00
Him188
2f7a9cf9d4 Add build.gradle 2020-01-18 21:35:20 +08:00
Him188
844d798f59 Add blocking wrappers 2020-01-11 23:51:37 +08:00
Him188
27819d7343 Better Android SDK checking 2020-01-05 17:38:46 +08:00
Him188
ddeb174aff Ignore Android targets when Android SDK is not installed 2020-01-05 17:18:02 +08:00
Him188
c68628f526 Create mirai-core-qqandroid 2019-12-23 19:31:13 +08:00
Him188
2f67f8363b Rewrite 2019-12-19 17:25:49 +08:00
Him188
e465b71ac8 Add mavenLocal 2019-12-07 00:33:44 +08:00
Him188
ab10d84ac6 Simplify build.gradle 2019-12-02 17:57:14 +08:00
Him188
2b2fb67397 Prefer to jcenter 2019-11-29 21:38:02 +08:00
Him188
951563d65f Publish to jcenter 2019-11-23 22:34:57 +08:00
Him188
d261cd7b7e Add http api basics 2019-11-21 21:31:05 +08:00
Him188
a00c5d895e Add JDK version check 2019-11-18 13:52:31 +08:00
Him188
f3278c8afe Update dependencies for mirai-debug 2019-11-08 20:51:40 +08:00
Him188
9ea86c13e2 Android support 2019-11-06 21:22:23 +08:00
Him188
71d5dda297 ByteArrayPool 2019-10-30 23:00:29 +08:00
Him188
490255bcd5 Update docs 2019-10-26 17:06:40 +08:00
Him188
cf052614f5 Use Klock 2019-10-19 13:41:36 +08:00
Him188
6d58cb1880 Debugging updates 2019-10-07 12:44:44 +08:00
Him188
b38c262df0 Multiplatform with gradle building 2019-10-03 19:07:03 +08:00