diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b7a34b393..cc1f27403c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,23 @@ ## 38.0.0 +* `All`: + * Update Kotlin from `2.3.21` to `2.4.21` and Gradle from `9.6.1` to `9.7.0` + * Update MicroUtils from `0.30.1` to `0.32.0` + * Update Ktor from `3.5.2` to `3.6.0` + * Update KotlinPoet from `2.3.0` to `2.4.0` + * Update KSLog from `1.7.0` to `2.1.0` + * Update Versions plugin from `0.54.0` to `0.65.0` + * Update Binary compatibility validator from `0.18.1` to `0.18.2` + * Update NMCP from `1.6.1` to `1.6.2` +* `Core`: + * Refresh the rebuilt JVM API dump with additive synthetic bridges and default constructors +* `WebApps`: + * Exclude JVM maintenance `.main.kts` scripts from Kotlin/JS compilation for Kotlin 2.4 + * Update events generator serialization JSON from `1.8.0` to `1.11.0` +* `BehaviourBuilderWithFSM`: + * Refresh the JVM API dump for the compiler-generated covariant `copy` bridge + ## 37.0.0 **THIS UPDATE CONTAINS SUPPORT OF [TELEGRAM BOTS API 10.3](https://core.telegram.org/bots/api-changelog#august-24-2026)** diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fe3c0185e6..f38d20ebb9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kotlin = "2.3.21" +kotlin = "2.4.21" kotlin-serialization = "1.11.0" kotlin-coroutines = "1.11.0" @@ -8,21 +8,21 @@ javax-activation = "1.1.1" korlibs = "5.4.0" uuid = "0.8.4" -ktor = "3.5.2" +ktor = "3.6.0" ksp = "2.3.11" -kotlin-poet = "2.3.0" +kotlin-poet = "2.4.0" -microutils = "0.30.1" -kslog = "1.7.0" +microutils = "0.32.0" +kslog = "2.1.0" -versions = "0.54.0" +versions = "0.65.0" github-release-plugin = "2.5.2" dokka = "2.2.0" -validator = "0.18.1" -nmcp = "1.6.1" +validator = "0.18.2" +nmcp = "1.6.2" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c74..eddabd2eef 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a351597e62..84c5a9c661 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,10 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip +distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index faf93008b7..249efbb032 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019c79..8508ef684d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -19,12 +19,12 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,30 +65,18 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/tgbotapi.behaviour_builder.fsm/api/tgbotapi.behaviour_builder.fsm.api b/tgbotapi.behaviour_builder.fsm/api/tgbotapi.behaviour_builder.fsm.api index 1c9c37a456..6151b1fa3b 100644 --- a/tgbotapi.behaviour_builder.fsm/api/tgbotapi.behaviour_builder.fsm.api +++ b/tgbotapi.behaviour_builder.fsm/api/tgbotapi.behaviour_builder.fsm.api @@ -3,6 +3,7 @@ public abstract interface class dev/inmo/tgbotapi/extensions/behaviour_builder/B public abstract fun add (Lkotlin/reflect/KClass;ZLdev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourWithFSMStateHandler;)V public static synthetic fun add$default (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM;Lkotlin/reflect/KClass;ZLdev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourWithFSMStateHandler;ILjava/lang/Object;)V public fun addStrict (Lkotlin/reflect/KClass;Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourWithFSMStateHandler;)V + public synthetic fun copy (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Lkotlinx/coroutines/CoroutineScope;ILkotlinx/coroutines/channels/BufferOverflow;Lkotlinx/coroutines/flow/Flow;Ldev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/TriggersHolder;Lkotlin/jvm/functions/Function3;)Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext; public abstract fun copy (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Lkotlinx/coroutines/CoroutineScope;ILkotlinx/coroutines/channels/BufferOverflow;Lkotlinx/coroutines/flow/Flow;Ldev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/TriggersHolder;Lkotlin/jvm/functions/Function3;)Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM; public abstract fun copy (Ldev/inmo/tgbotapi/bot/RequestsExecutor;Lkotlinx/coroutines/CoroutineScope;ILkotlinx/coroutines/channels/BufferOverflow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;Ldev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/TriggersHolder;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;)Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM; public static synthetic fun copy$default (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM;Ldev/inmo/tgbotapi/bot/RequestsExecutor;Lkotlinx/coroutines/CoroutineScope;ILkotlinx/coroutines/channels/BufferOverflow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;Ldev/inmo/tgbotapi/extensions/behaviour_builder/utils/handlers_registrar/TriggersHolder;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;ILjava/lang/Object;)Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextWithFSM; diff --git a/tgbotapi.core/api/tgbotapi.core.api b/tgbotapi.core/api/tgbotapi.core.api index 541ea597a4..39fc812b8a 100644 --- a/tgbotapi.core/api/tgbotapi.core.api +++ b/tgbotapi.core/api/tgbotapi.core.api @@ -244,6 +244,7 @@ public abstract interface class dev/inmo/tgbotapi/abstracts/types/UntilDate { public abstract interface class dev/inmo/tgbotapi/abstracts/types/WithBusinessConnectionId : dev/inmo/tgbotapi/abstracts/types/WithOptionalBusinessConnectionId { public abstract fun getBusinessConnectionId-T-_HSQI ()Ljava/lang/String; + public synthetic fun getBusinessConnectionId-nXr5wdE ()Ljava/lang/String; } public abstract interface class dev/inmo/tgbotapi/abstracts/types/WithOptionalBusinessConnectionId { @@ -307,6 +308,7 @@ public abstract class dev/inmo/tgbotapi/bot/exceptions/CommonBotException : dev/ public synthetic fun (Ljava/lang/String;Ljava/lang/Throwable;Ldev/inmo/tgbotapi/types/Response;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (Ljava/lang/String;Ljava/lang/Throwable;Ldev/inmo/tgbotapi/types/Response;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public abstract fun createCopy ()Ldev/inmo/tgbotapi/bot/exceptions/CommonBotException; + public synthetic fun createCopy ()Ljava/lang/Throwable; } public final class dev/inmo/tgbotapi/bot/exceptions/CommonBotException$Companion { @@ -959,6 +961,7 @@ public final class dev/inmo/tgbotapi/requests/ForwardMessagesKt { public final class dev/inmo/tgbotapi/requests/GetUpdates : dev/inmo/tgbotapi/requests/GetUpdatesRequest { public static final field Companion Ldev/inmo/tgbotapi/requests/GetUpdates$Companion; + public fun ()V public synthetic fun (Ldev/inmo/tgbotapi/types/UpdateId;ILjava/lang/Integer;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (Ldev/inmo/tgbotapi/types/UpdateId;ILjava/lang/Integer;Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1-FG9WeOs ()Ldev/inmo/tgbotapi/types/UpdateId; @@ -996,6 +999,7 @@ public final class dev/inmo/tgbotapi/requests/GetUpdates$Companion { public final class dev/inmo/tgbotapi/requests/GetUpdatesRaw : dev/inmo/tgbotapi/requests/GetUpdatesRequest { public static final field Companion Ldev/inmo/tgbotapi/requests/GetUpdatesRaw$Companion; + public fun ()V public synthetic fun (Ldev/inmo/tgbotapi/types/UpdateId;ILjava/lang/Integer;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (Ldev/inmo/tgbotapi/types/UpdateId;ILjava/lang/Integer;Ljava/util/List;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1-FG9WeOs ()Ldev/inmo/tgbotapi/types/UpdateId; @@ -3528,7 +3532,9 @@ public final class dev/inmo/tgbotapi/requests/chat/invite_links/CreateChatInvite } public abstract interface class dev/inmo/tgbotapi/requests/chat/invite_links/CreateChatInviteLink$Subscription : dev/inmo/tgbotapi/abstracts/types/SubscriptionInfo, dev/inmo/tgbotapi/requests/chat/invite_links/CreateChatInviteLink { + public synthetic fun getSubscriptionPeriod-FghU774 ()Lkotlin/time/Duration; public abstract fun getSubscriptionPeriod-UwyO8pc ()J + public synthetic fun getSubscriptionPrice-0hXNFcg ()Lkotlin/UInt; public abstract fun getSubscriptionPrice-pVg5ArA ()I public fun method ()Ljava/lang/String; } @@ -4722,6 +4728,7 @@ public abstract interface class dev/inmo/tgbotapi/requests/edit/abstracts/EditMe public abstract interface class dev/inmo/tgbotapi/requests/edit/abstracts/EditReplyMessage : dev/inmo/tgbotapi/abstracts/types/WithReplyMarkup { public abstract fun getReplyMarkup ()Ldev/inmo/tgbotapi/types/buttons/InlineKeyboardMarkup; + public synthetic fun getReplyMarkup ()Ldev/inmo/tgbotapi/types/buttons/KeyboardMarkup; } public abstract interface class dev/inmo/tgbotapi/requests/edit/abstracts/EditTextChatMessage : dev/inmo/tgbotapi/abstracts/TextedOutput { @@ -14474,6 +14481,7 @@ public final class dev/inmo/tgbotapi/types/InlineQueries/query/BaseInlineQuery : public abstract interface class dev/inmo/tgbotapi/types/InlineQueries/query/InlineQuery : dev/inmo/tgbotapi/abstracts/FromUser { public abstract fun getChatType ()Ldev/inmo/tgbotapi/types/chat/ChatType; public abstract fun getFrom ()Ldev/inmo/tgbotapi/types/chat/CommonUser; + public synthetic fun getFrom ()Ldev/inmo/tgbotapi/types/chat/User; public abstract fun getId-5UnZwr4 ()Ljava/lang/String; public abstract fun getOffset ()Ljava/lang/String; public abstract fun getQuery ()Ljava/lang/String; @@ -18567,6 +18575,7 @@ public final class dev/inmo/tgbotapi/types/chat/Bot$Companion { public abstract interface class dev/inmo/tgbotapi/types/chat/BusinessChat : dev/inmo/tgbotapi/types/chat/Chat { public static final field Companion Ldev/inmo/tgbotapi/types/chat/BusinessChat$Companion; + public synthetic fun getId ()Ldev/inmo/tgbotapi/types/IdChatIdentifier; public abstract fun getId-y8AA8dk ()Lkotlin/Pair; public abstract fun getOriginal ()Ldev/inmo/tgbotapi/types/chat/PrivateChat; } @@ -18613,6 +18622,7 @@ public final class dev/inmo/tgbotapi/types/chat/BusinessChatImpl$Companion { public abstract interface class dev/inmo/tgbotapi/types/chat/ChannelChat : dev/inmo/tgbotapi/types/chat/SuperPublicChat { public static final field Companion Ldev/inmo/tgbotapi/types/chat/ChannelChat$Companion; + public synthetic fun getId ()Ldev/inmo/tgbotapi/types/IdChatIdentifier; public abstract fun getId-tHkBKVM ()J } @@ -19406,6 +19416,7 @@ public final class dev/inmo/tgbotapi/types/chat/ExtendedBot$Companion { public abstract interface class dev/inmo/tgbotapi/types/chat/ExtendedBusinessChat : dev/inmo/tgbotapi/types/chat/BusinessChat, dev/inmo/tgbotapi/types/chat/ExtendedChat { public static final field Companion Ldev/inmo/tgbotapi/types/chat/ExtendedBusinessChat$Companion; public abstract fun getOriginal ()Ldev/inmo/tgbotapi/types/chat/ExtendedPrivateChat; + public synthetic fun getOriginal ()Ldev/inmo/tgbotapi/types/chat/PrivateChat; } public final class dev/inmo/tgbotapi/types/chat/ExtendedBusinessChat$Companion { @@ -21056,6 +21067,7 @@ public abstract interface class dev/inmo/tgbotapi/types/chat/member/ChatMember : public static final field Companion Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Companion; public abstract fun getStatus ()Ldev/inmo/tgbotapi/types/chat/member/ChatMember$Status; public abstract fun getUser ()Ldev/inmo/tgbotapi/types/chat/PreviewUser; + public synthetic fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; } public final class dev/inmo/tgbotapi/types/chat/member/ChatMember$Companion { @@ -23829,6 +23841,7 @@ public abstract interface class dev/inmo/tgbotapi/types/gifts/Gift$Regular : dev public static final field Companion Ldev/inmo/tgbotapi/types/gifts/Gift$Regular$Companion; public abstract fun getBackground ()Ldev/inmo/tgbotapi/types/gifts/GiftBackground; public abstract fun getHasColors ()Z + public synthetic fun getId-FhTg01o ()Ljava/lang/String; public abstract fun getId-OyCYJok ()Ljava/lang/String; public abstract fun getPersonalRemainingCount ()Ljava/lang/Integer; public abstract fun getPersonalTotalCount ()Ljava/lang/Integer; @@ -24047,6 +24060,7 @@ public final class dev/inmo/tgbotapi/types/gifts/GiftSentOrReceivedEvent$Compani public abstract interface class dev/inmo/tgbotapi/types/gifts/GiftSentOrReceivedEvent$ReceivedInBusinessAccount : dev/inmo/tgbotapi/types/gifts/GiftSentOrReceivedEvent { public static final field Companion Ldev/inmo/tgbotapi/types/gifts/GiftSentOrReceivedEvent$ReceivedInBusinessAccount$Companion; + public synthetic fun getOwnedGiftId-FhTg01o ()Ljava/lang/String; public abstract fun getOwnedGiftId-OyCYJok ()Ljava/lang/String; } @@ -24059,6 +24073,7 @@ public abstract interface class dev/inmo/tgbotapi/types/gifts/GiftSentOrReceived public abstract fun getCanBeUpgraded ()Z public abstract fun getConvertStarCount ()Ljava/lang/Integer; public abstract fun getGift ()Ldev/inmo/tgbotapi/types/gifts/Gift$Regular; + public synthetic fun getGift ()Ldev/inmo/tgbotapi/types/gifts/Gift; public abstract fun getPrepaidUpgradeStarCount ()Ljava/lang/Integer; public abstract fun getUniqueGiftNumber ()Ljava/lang/Integer; public abstract fun isPrivate ()Z @@ -24175,6 +24190,7 @@ public final class dev/inmo/tgbotapi/types/gifts/GiftSentOrReceivedEvent$Regular public abstract interface class dev/inmo/tgbotapi/types/gifts/GiftSentOrReceivedEvent$UniqueGift : dev/inmo/tgbotapi/abstracts/TextedInput, dev/inmo/tgbotapi/types/gifts/GiftSentOrReceivedEvent { public static final field Companion Ldev/inmo/tgbotapi/types/gifts/GiftSentOrReceivedEvent$UniqueGift$Companion; public abstract fun getGift ()Ldev/inmo/tgbotapi/types/gifts/Gift$Unique; + public synthetic fun getGift ()Ldev/inmo/tgbotapi/types/gifts/Gift; public abstract fun getLastResaleAmount ()Ljava/lang/Long; public abstract fun getLastResaleCurrency ()Ljava/lang/String; public abstract fun getLastResaleStarCount ()Ljava/lang/Integer; @@ -24436,6 +24452,7 @@ public final class dev/inmo/tgbotapi/types/gifts/OwnedGift$Companion : kotlinx/s public abstract interface class dev/inmo/tgbotapi/types/gifts/OwnedGift$OwnedByBusinessAccount : dev/inmo/tgbotapi/types/gifts/OwnedGift { public static final field Companion Ldev/inmo/tgbotapi/types/gifts/OwnedGift$OwnedByBusinessAccount$Companion; + public synthetic fun getOwnedGiftId-FhTg01o ()Ljava/lang/String; public abstract fun getOwnedGiftId-OyCYJok ()Ljava/lang/String; } @@ -24448,6 +24465,7 @@ public abstract interface class dev/inmo/tgbotapi/types/gifts/OwnedGift$Regular public abstract fun getCanBeUpgraded ()Z public abstract fun getConvertStarCount ()Ljava/lang/Integer; public abstract fun getGift ()Ldev/inmo/tgbotapi/types/gifts/Gift$Regular; + public synthetic fun getGift ()Ldev/inmo/tgbotapi/types/gifts/Gift; public abstract fun getPrepaidUpgradeStarCount ()Ljava/lang/Integer; public abstract fun getUniqueGiftNumber ()Ljava/lang/Integer; public abstract fun getWasRefunded ()Z @@ -24576,6 +24594,7 @@ public abstract interface class dev/inmo/tgbotapi/types/gifts/OwnedGift$Unique : public static final field Companion Ldev/inmo/tgbotapi/types/gifts/OwnedGift$Unique$Companion; public abstract fun getCanBeTransferred ()Z public abstract fun getGift ()Ldev/inmo/tgbotapi/types/gifts/Gift$Unique; + public synthetic fun getGift ()Ldev/inmo/tgbotapi/types/gifts/Gift; public abstract fun getNextTransferDate ()Ldev/inmo/tgbotapi/types/TelegramDate; public abstract fun getTransferStarCount ()Ljava/lang/Integer; } @@ -25552,6 +25571,7 @@ public final class dev/inmo/tgbotapi/types/media/PollMedia$Serializer : kotlinx/ public final class dev/inmo/tgbotapi/types/media/PollMedia$Serializer$Surrogate { public static final field Companion Ldev/inmo/tgbotapi/types/media/PollMedia$Serializer$Surrogate$Companion; + public fun ()V public synthetic fun (Ldev/inmo/tgbotapi/types/files/AnimationFile;Ldev/inmo/tgbotapi/types/files/AudioFile;Ldev/inmo/tgbotapi/types/files/DocumentFile;Ldev/inmo/tgbotapi/types/Link;Ldev/inmo/tgbotapi/types/files/LivePhotoFile;Ljava/util/List;Ldev/inmo/tgbotapi/types/files/Sticker;Ldev/inmo/tgbotapi/types/files/VideoFile;Ldev/inmo/tgbotapi/types/location/StaticLocation;Ldev/inmo/tgbotapi/types/venue/Venue;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (Ldev/inmo/tgbotapi/types/files/AnimationFile;Ldev/inmo/tgbotapi/types/files/AudioFile;Ldev/inmo/tgbotapi/types/files/DocumentFile;Ldev/inmo/tgbotapi/types/Link;Ldev/inmo/tgbotapi/types/files/LivePhotoFile;Ljava/util/List;Ldev/inmo/tgbotapi/types/files/Sticker;Ldev/inmo/tgbotapi/types/files/VideoFile;Ldev/inmo/tgbotapi/types/location/StaticLocation;Ldev/inmo/tgbotapi/types/venue/Venue;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Ldev/inmo/tgbotapi/types/files/AnimationFile; @@ -28715,7 +28735,9 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/AnonymousGroupConte public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/BusinessContentMessage : dev/inmo/tgbotapi/abstracts/types/WithBusinessConnectionId, dev/inmo/tgbotapi/types/message/abstracts/FromUserChatMessage, dev/inmo/tgbotapi/types/message/abstracts/PossiblySentViaBotCommonMessage { public abstract fun getBusinessConnectionId-T-_HSQI ()Ljava/lang/String; + public synthetic fun getBusinessConnectionId-nXr5wdE ()Ljava/lang/String; public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewBusinessChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; public abstract fun getSenderBusinessBot ()Ldev/inmo/tgbotapi/types/chat/PreviewBot; public fun getSentByBusinessConnectionOwner ()Z } @@ -28731,6 +28753,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/BusinessContentMess public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/ChannelContentMessage : dev/inmo/tgbotapi/types/message/abstracts/OptionallyFromUserMessage, dev/inmo/tgbotapi/types/message/abstracts/PossiblySentViaBotCommonMessage, dev/inmo/tgbotapi/types/message/abstracts/SignedMessage, dev/inmo/tgbotapi/types/message/abstracts/WithSenderChatMessage { public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; public fun getFrom ()Ldev/inmo/tgbotapi/types/chat/User; public abstract fun isPaidPost ()Z } @@ -28747,6 +28770,9 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/ChannelContentMessa public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesContentMessage : dev/inmo/tgbotapi/types/message/abstracts/GroupContentMessage { public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewGroupChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewPublicChat; public fun getDirectMessageThreadId-_JBF_Q4 ()J public abstract fun getDirectMessageTopic ()Ldev/inmo/tgbotapi/types/chat/DirectMessagesTopic; } @@ -28762,6 +28788,8 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessag public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesEventMessage : dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage { public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChannelDirectMessagesChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewGroupChat; } public final class dev/inmo/tgbotapi/types/message/abstracts/ChannelDirectMessagesEventMessage$DefaultImpls { @@ -28900,8 +28928,12 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/ContentMessage$Defa } public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/ForumContentMessage : dev/inmo/tgbotapi/types/message/abstracts/GroupContentMessage, dev/inmo/tgbotapi/types/message/abstracts/PossiblyTopicMessage { + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewForumChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewGroupChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewPublicChat; public fun getThreadCreatingInfo ()Ldev/inmo/tgbotapi/types/message/ChatEvents/forum/ForumTopicCreated; + public synthetic fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId; public abstract fun getThreadId-hDmiKeI ()J } @@ -28987,7 +29019,9 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/FromUserMessage$Def } public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/GroupContentMessage : dev/inmo/tgbotapi/types/message/abstracts/PublicContentMessage { + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewGroupChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewPublicChat; } public final class dev/inmo/tgbotapi/types/message/abstracts/GroupContentMessage$DefaultImpls { @@ -28999,6 +29033,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/GroupContentMessage } public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage : dev/inmo/tgbotapi/types/message/abstracts/ChatEventMessage, dev/inmo/tgbotapi/types/message/abstracts/FromUserChatMessage { + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewGroupChat; } @@ -29244,6 +29279,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/PotentiallyFromUser } public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/PrivateContentMessage : dev/inmo/tgbotapi/types/message/abstracts/FromUserChatMessage, dev/inmo/tgbotapi/types/message/abstracts/PossiblyGuestAnswerMessage, dev/inmo/tgbotapi/types/message/abstracts/PossiblyOfflineMessage, dev/inmo/tgbotapi/types/message/abstracts/PossiblySentViaBotCommonMessage, dev/inmo/tgbotapi/types/message/abstracts/PossiblyWithEffectMessage { + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewPrivateChat; } @@ -29257,6 +29293,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/PrivateContentMessa } public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/PrivateForumContentMessage : dev/inmo/tgbotapi/types/message/abstracts/PossiblyTopicMessage, dev/inmo/tgbotapi/types/message/abstracts/PrivateContentMessage { + public synthetic fun getThreadId-S3HF-10 ()Ldev/inmo/tgbotapi/types/MessageThreadId; public abstract fun getThreadId-hDmiKeI ()J } @@ -29270,6 +29307,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/PrivateForumContent } public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/PublicContentMessage : dev/inmo/tgbotapi/types/message/abstracts/PossiblySentViaBotCommonMessage { + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewPublicChat; } @@ -29295,6 +29333,7 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/RequestGuestContent public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/RequestGuestMessage : dev/inmo/tgbotapi/abstracts/types/WithOptionalGuestQueryId, dev/inmo/tgbotapi/types/message/abstracts/Message { public abstract fun getGuestQueryId-87nd9ik ()Ljava/lang/String; + public synthetic fun getGuestQueryId-BCLlPIY ()Ljava/lang/String; } public final class dev/inmo/tgbotapi/types/message/abstracts/RequestGuestMessage$DefaultImpls { @@ -29333,6 +29372,8 @@ public final class dev/inmo/tgbotapi/types/message/abstracts/SuggestedChannelDir } public abstract interface class dev/inmo/tgbotapi/types/message/abstracts/SupergroupEventMessage : dev/inmo/tgbotapi/types/message/abstracts/GroupEventMessage { + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewChat; + public synthetic fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewGroupChat; public abstract fun getChat ()Ldev/inmo/tgbotapi/types/chat/PreviewSupergroupChat; } @@ -29466,7 +29507,9 @@ public final class dev/inmo/tgbotapi/types/message/content/AudioContent$Companio public abstract interface class dev/inmo/tgbotapi/types/message/content/AudioMediaGroupPartContent : dev/inmo/tgbotapi/types/message/content/MediaGroupPartContent { public abstract fun getMedia ()Ldev/inmo/tgbotapi/types/files/AudioFile; + public synthetic fun getMedia ()Ldev/inmo/tgbotapi/types/files/TelegramMediaFile; public abstract fun toMediaGroupMemberTelegramMedia ()Ldev/inmo/tgbotapi/types/media/AudioMediaGroupMemberTelegramMedia; + public synthetic fun toMediaGroupMemberTelegramMedia ()Ldev/inmo/tgbotapi/types/media/MediaGroupMemberTelegramMedia; } public final class dev/inmo/tgbotapi/types/message/content/AudioMediaGroupPartContent$DefaultImpls { @@ -29608,7 +29651,9 @@ public final class dev/inmo/tgbotapi/types/message/content/DocumentContentKt { public abstract interface class dev/inmo/tgbotapi/types/message/content/DocumentMediaGroupPartContent : dev/inmo/tgbotapi/types/message/content/MediaGroupPartContent { public abstract fun getMedia ()Ldev/inmo/tgbotapi/types/files/DocumentFile; + public synthetic fun getMedia ()Ldev/inmo/tgbotapi/types/files/TelegramMediaFile; public abstract fun toMediaGroupMemberTelegramMedia ()Ldev/inmo/tgbotapi/types/media/DocumentMediaGroupMemberTelegramMedia; + public synthetic fun toMediaGroupMemberTelegramMedia ()Ldev/inmo/tgbotapi/types/media/MediaGroupMemberTelegramMedia; } public final class dev/inmo/tgbotapi/types/message/content/DocumentMediaGroupPartContent$DefaultImpls { @@ -30365,6 +30410,7 @@ public final class dev/inmo/tgbotapi/types/message/content/VideoNoteContent$Comp } public abstract interface class dev/inmo/tgbotapi/types/message/content/VisualMediaGroupPartContent : dev/inmo/tgbotapi/types/message/content/MediaGroupPartContent, dev/inmo/tgbotapi/types/message/content/SpoilerableMediaContent, dev/inmo/tgbotapi/types/message/content/WithCustomizedCaptionMediaContent { + public synthetic fun toMediaGroupMemberTelegramMedia ()Ldev/inmo/tgbotapi/types/media/MediaGroupMemberTelegramMedia; public abstract fun toMediaGroupMemberTelegramMedia ()Ldev/inmo/tgbotapi/types/media/VisualMediaGroupMemberTelegramMedia; } @@ -34727,6 +34773,7 @@ public final class dev/inmo/tgbotapi/types/queries/callback/AbstractMessageCallb public abstract interface class dev/inmo/tgbotapi/types/queries/callback/CallbackQuery : dev/inmo/tgbotapi/abstracts/FromUser { public abstract fun getChatInstance ()Ljava/lang/String; public abstract fun getFrom ()Ldev/inmo/tgbotapi/types/chat/CommonUser; + public synthetic fun getFrom ()Ldev/inmo/tgbotapi/types/chat/User; public abstract fun getId-WfrJ78I ()Ljava/lang/String; public fun getUser ()Ldev/inmo/tgbotapi/types/chat/CommonUser; public synthetic fun getUser ()Ldev/inmo/tgbotapi/types/chat/User; @@ -34754,6 +34801,7 @@ public final class dev/inmo/tgbotapi/types/queries/callback/GameShortNameCallbac public abstract interface class dev/inmo/tgbotapi/types/queries/callback/InaccessibleMessageCallbackQuery : dev/inmo/tgbotapi/types/queries/callback/AbstractMessageCallbackQuery { public abstract fun getMessage ()Ldev/inmo/tgbotapi/types/message/abstracts/InaccessibleMessage; + public synthetic fun getMessage ()Ldev/inmo/tgbotapi/types/message/abstracts/Message; } public final class dev/inmo/tgbotapi/types/queries/callback/InaccessibleMessageCallbackQuery$DefaultImpls { @@ -34876,6 +34924,7 @@ public final class dev/inmo/tgbotapi/types/queries/callback/InlineMessageIdGameS public abstract interface class dev/inmo/tgbotapi/types/queries/callback/MessageCallbackQuery : dev/inmo/tgbotapi/types/queries/callback/AbstractMessageCallbackQuery { public abstract fun getMessage ()Ldev/inmo/tgbotapi/types/message/abstracts/ContentMessage; + public synthetic fun getMessage ()Ldev/inmo/tgbotapi/types/message/abstracts/Message; } public final class dev/inmo/tgbotapi/types/queries/callback/MessageCallbackQuery$DefaultImpls { @@ -40524,11 +40573,14 @@ public final class dev/inmo/tgbotapi/types/update/ShippingQueryUpdate : dev/inmo } public abstract interface class dev/inmo/tgbotapi/types/update/abstracts/BaseEditMessageUpdate : dev/inmo/tgbotapi/types/update/abstracts/BaseMessageUpdate { + public synthetic fun getData ()Ldev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage; public abstract fun getData ()Ldev/inmo/tgbotapi/types/message/abstracts/ChatContentMessage; + public synthetic fun getData ()Ljava/lang/Object; } public abstract interface class dev/inmo/tgbotapi/types/update/abstracts/BaseMessageUpdate : dev/inmo/tgbotapi/types/update/abstracts/Update { public abstract fun getData ()Ldev/inmo/tgbotapi/types/message/abstracts/AccessibleMessage; + public synthetic fun getData ()Ljava/lang/Object; } public abstract interface class dev/inmo/tgbotapi/types/update/abstracts/BaseSentMessageUpdate : dev/inmo/tgbotapi/types/update/abstracts/BaseMessageUpdate { @@ -40537,6 +40589,7 @@ public abstract interface class dev/inmo/tgbotapi/types/update/abstracts/BaseSen public abstract interface class dev/inmo/tgbotapi/types/update/abstracts/ChatMemberUpdatedUpdate : dev/inmo/tgbotapi/types/update/abstracts/Update { public abstract fun getData ()Ldev/inmo/tgbotapi/types/chat/member/ChatMemberUpdated; + public synthetic fun getData ()Ljava/lang/Object; } public final class dev/inmo/tgbotapi/types/update/abstracts/UnknownUpdate : dev/inmo/tgbotapi/types/update/abstracts/Update { @@ -40646,6 +40699,7 @@ public final class dev/inmo/tgbotapi/types/webapps/WebAppInfo$Companion { public final class dev/inmo/tgbotapi/types/webapps/query/SentWebAppMessage { public static final field Companion Ldev/inmo/tgbotapi/types/webapps/query/SentWebAppMessage$Companion; + public fun ()V public synthetic fun (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public synthetic fun (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1-FuCAEeA ()Ljava/lang/String; diff --git a/tgbotapi.webapps/build.gradle b/tgbotapi.webapps/build.gradle index 8a5da2c325..4fd0392a40 100644 --- a/tgbotapi.webapps/build.gradle +++ b/tgbotapi.webapps/build.gradle @@ -12,6 +12,10 @@ apply from: "$mpp_publish" kotlin { sourceSets { + jsMain { + // JVM maintenance scripts are not Kotlin/JS library sources. + kotlin.exclude("**/*.main.kts") + } commonMain { dependencies { api project(":tgbotapi.core") diff --git a/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/events/events_generator.main.kts b/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/events/events_generator.main.kts index a5b1b3c47e..5abc5ae50e 100755 --- a/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/events/events_generator.main.kts +++ b/tgbotapi.webapps/src/jsMain/kotlin/dev/inmo/tgbotapi/webapps/events/events_generator.main.kts @@ -1,6 +1,6 @@ #!/usr/bin/env kotlin // This script will read Event -@file:DependsOn("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") +@file:DependsOn("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0") import kotlinx.serialization.json.* import java.io.File