From 850fcd0afebcc29c9b084382413abc42bf64043c Mon Sep 17 00:00:00 2001 From: Him188 <Him188@mamoe.net> Date: Thu, 24 Jun 2021 01:19:49 +0800 Subject: [PATCH] Fix build --- .../android/api/binary-compatibility-validator-android.api | 3 +-- .../api/binary-compatibility-validator.api | 3 +-- mirai-console | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api b/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api index accd37aee..39538bc1f 100644 --- a/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api +++ b/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api @@ -362,7 +362,6 @@ public abstract interface class net/mamoe/mirai/contact/Group : kotlinx/coroutin public abstract fun getSettings ()Lnet/mamoe/mirai/contact/GroupSettings; public fun quit ()Z public abstract fun quit (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public static synthetic fun sendAnnouncement$default (Lnet/mamoe/mirai/contact/Group$Companion;Lnet/mamoe/mirai/contact/Group;Ljava/lang/String;Ljava/lang/String;Lnet/mamoe/mirai/data/AnnouncementParameters;ILjava/lang/Object;)V public fun sendMessage (Ljava/lang/String;)Lnet/mamoe/mirai/message/MessageReceipt; public fun sendMessage (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public fun sendMessage (Lnet/mamoe/mirai/message/data/Message;)Lnet/mamoe/mirai/message/MessageReceipt; @@ -579,7 +578,6 @@ public class net/mamoe/mirai/data/Announcement { public final fun getMsg ()Ljava/lang/String; public final fun getParameters ()Lnet/mamoe/mirai/data/AnnouncementParameters; public final fun getTitle ()Ljava/lang/String; - public synthetic fun publish (Lnet/mamoe/mirai/contact/Group;)Lkotlin/Unit; public fun publish (Lnet/mamoe/mirai/contact/Group;)V public final fun publish (Lnet/mamoe/mirai/contact/Group;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; } @@ -931,6 +929,7 @@ public final class net/mamoe/mirai/data/GroupAnnouncement$Companion { public final class net/mamoe/mirai/data/GroupAnnouncementImage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/data/GroupAnnouncementImage$$serializer; + public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/data/GroupAnnouncementImage; diff --git a/binary-compatibility-validator/api/binary-compatibility-validator.api b/binary-compatibility-validator/api/binary-compatibility-validator.api index 0c44154bb..415fc4c71 100644 --- a/binary-compatibility-validator/api/binary-compatibility-validator.api +++ b/binary-compatibility-validator/api/binary-compatibility-validator.api @@ -362,7 +362,6 @@ public abstract interface class net/mamoe/mirai/contact/Group : kotlinx/coroutin public abstract fun getSettings ()Lnet/mamoe/mirai/contact/GroupSettings; public fun quit ()Z public abstract fun quit (Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public static synthetic fun sendAnnouncement$default (Lnet/mamoe/mirai/contact/Group$Companion;Lnet/mamoe/mirai/contact/Group;Ljava/lang/String;Ljava/lang/String;Lnet/mamoe/mirai/data/AnnouncementParameters;ILjava/lang/Object;)V public fun sendMessage (Ljava/lang/String;)Lnet/mamoe/mirai/message/MessageReceipt; public fun sendMessage (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; public fun sendMessage (Lnet/mamoe/mirai/message/data/Message;)Lnet/mamoe/mirai/message/MessageReceipt; @@ -579,7 +578,6 @@ public class net/mamoe/mirai/data/Announcement { public final fun getMsg ()Ljava/lang/String; public final fun getParameters ()Lnet/mamoe/mirai/data/AnnouncementParameters; public final fun getTitle ()Ljava/lang/String; - public synthetic fun publish (Lnet/mamoe/mirai/contact/Group;)Lkotlin/Unit; public fun publish (Lnet/mamoe/mirai/contact/Group;)V public final fun publish (Lnet/mamoe/mirai/contact/Group;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; } @@ -931,6 +929,7 @@ public final class net/mamoe/mirai/data/GroupAnnouncement$Companion { public final class net/mamoe/mirai/data/GroupAnnouncementImage$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lnet/mamoe/mirai/data/GroupAnnouncementImage$$serializer; + public static final synthetic field descriptor Lkotlinx/serialization/descriptors/SerialDescriptor; public fun childSerializers ()[Lkotlinx/serialization/KSerializer; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/data/GroupAnnouncementImage; diff --git a/mirai-console b/mirai-console index a51803758..d534bbcb4 160000 --- a/mirai-console +++ b/mirai-console @@ -1 +1 @@ -Subproject commit a5180375858a18c8a4e457ffcbe57270330f0d38 +Subproject commit d534bbcb4803b800d5a1358f920d69860b21dbb4