Skip to content

Commit

Permalink
Update dependencies and binary compatibility validator workflow (#672)
Browse files Browse the repository at this point in the history
* Update dependencies

* Change binary compatibility validator workflow

* Remove comment about api dump on `Library.isRelease`, it is no longer accurate

* Update api dump after merge
  • Loading branch information
lukellmann authored Aug 18, 2022
1 parent 1bdd345 commit f05cfa8
Show file tree
Hide file tree
Showing 10 changed files with 518 additions and 828 deletions.
11 changes: 2 additions & 9 deletions .github/workflows/deployment-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
with:
arguments: --stacktrace --info build -x apiCheck
arguments: --stacktrace --info build


release:
Expand Down Expand Up @@ -74,14 +74,7 @@ jobs:
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
with:
arguments: --stacktrace --info build -x apiCheck

- name: API Checking with Gradle
uses: gradle/gradle-build-action@v2
with:
arguments: apiCheck


arguments: --stacktrace --info build

- name: Publish with Gradle
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL
plugins {
kotlin("jvm")
kotlin("plugin.serialization")
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.10.1"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.11.0"
id("org.jetbrains.dokka")

id("org.ajoberstar.git-publish") version "3.0.1"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ dependencies {
implementation(kotlin("gradle-plugin", kotlinVersion))
implementation(kotlin("serialization", kotlinVersion))
implementation("org.jetbrains.dokka", "dokka-gradle-plugin", "1.7.10")
implementation("org.jetbrains.kotlinx", "atomicfu-gradle-plugin", "0.18.2")
implementation("org.jetbrains.kotlinx", "atomicfu-gradle-plugin", "0.18.3")
implementation(gradleApi())
}
3 changes: 0 additions & 3 deletions buildSrc/src/main/kotlin/Projects.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ object Library {

val isSnapshot: Boolean get() = version.endsWith("-SNAPSHOT")

/**
* Whether the current API is considered stable, and should be compared to the 'golden' API dump.
*/
val isRelease: Boolean get() = !isSnapshot && !isUndefined

val isUndefined get() = version == "undefined"
Expand Down
4 changes: 0 additions & 4 deletions buildSrc/src/main/kotlin/kord-module.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ kotlin {
}

tasks {
getByName("apiCheck") {
onlyIf { Library.isRelease }
}

withType<JavaCompile> {
sourceCompatibility = Jvm.targetString
targetCompatibility = Jvm.targetString
Expand Down
8 changes: 4 additions & 4 deletions common/api/common.api
Original file line number Diff line number Diff line change
Expand Up @@ -6730,8 +6730,8 @@ public final class dev/kord/common/entity/Permission$ChangeNickname : dev/kord/c
}

public final class dev/kord/common/entity/Permission$Companion {
public final fun getManageEmojis ()Ldev/kord/common/entity/Permission$ManageEmojisAndStickers;
public final fun getUseSlashCommands ()Ldev/kord/common/entity/Permission$UseApplicationCommands;
public final synthetic fun getManageEmojis ()Ldev/kord/common/entity/Permission$ManageEmojisAndStickers;
public final synthetic fun getUseSlashCommands ()Ldev/kord/common/entity/Permission$UseApplicationCommands;
public final fun getValues ()Ljava/util/Set;
}

Expand Down Expand Up @@ -7124,7 +7124,7 @@ public final class dev/kord/common/entity/Snowflake : java/lang/Comparable {
public final fun getIncrement-Mh2AYeg ()S
public final fun getProcessId-w2LRezQ ()B
public final fun getTimeMark ()Lkotlin/time/TimeMark;
public final fun getTimeStamp ()Lkotlinx/datetime/Instant;
public final synthetic fun getTimeStamp ()Lkotlinx/datetime/Instant;
public final fun getTimestamp ()Lkotlinx/datetime/Instant;
public final fun getValue-s-VKNKU ()J
public final fun getWorkerId-w2LRezQ ()B
Expand All @@ -7134,7 +7134,7 @@ public final class dev/kord/common/entity/Snowflake : java/lang/Comparable {

public final class dev/kord/common/entity/Snowflake$Companion {
public final fun getDiscordEpoch ()Lkotlinx/datetime/Instant;
public final fun getDiscordEpochStart ()Lkotlinx/datetime/Instant;
public final synthetic fun getDiscordEpochStart ()Lkotlinx/datetime/Instant;
public final fun getEndOfTime ()Lkotlinx/datetime/Instant;
public final fun getMax ()Ldev/kord/common/entity/Snowflake;
public final fun getMin ()Ldev/kord/common/entity/Snowflake;
Expand Down
1,277 changes: 484 additions & 793 deletions core/api/core.api

Large diffs are not rendered by default.

23 changes: 16 additions & 7 deletions rest/api/rest.api
Original file line number Diff line number Diff line change
Expand Up @@ -1889,6 +1889,7 @@ public final class dev/kord/rest/json/JsonErrorCode : java/lang/Enum {
public static final field AlreadyCrossposted Ldev/kord/rest/json/JsonErrorCode;
public static final field AnnouncementRateLimit Ldev/kord/rest/json/JsonErrorCode;
public static final field ApplicationCommandNameExists Ldev/kord/rest/json/JsonErrorCode;
public static final field ApplicationNotAvailable Ldev/kord/rest/json/JsonErrorCode;
public static final field BeforeValueBeforeThreadCreate Ldev/kord/rest/json/JsonErrorCode;
public static final field BitrateTooHigh Ldev/kord/rest/json/JsonErrorCode;
public static final field BotsEndpoint Ldev/kord/rest/json/JsonErrorCode;
Expand All @@ -1911,8 +1912,10 @@ public final class dev/kord/rest/json/JsonErrorCode : java/lang/Enum {
public static final field ChannelWriteRateLimit Ldev/kord/rest/json/JsonErrorCode;
public static final field CommunityServerChannelMustBeTextChannel Ldev/kord/rest/json/JsonErrorCode;
public static final field Companion Ldev/kord/rest/json/JsonErrorCode$Companion;
public static final field ConnectionRevoked Ldev/kord/rest/json/JsonErrorCode;
public static final field DisallowedName Ldev/kord/rest/json/JsonErrorCode;
public static final field FailedToCreateStage Ldev/kord/rest/json/JsonErrorCode;
public static final field FailedToResizeAssetBelowMaximumSize Ldev/kord/rest/json/JsonErrorCode;
public static final field FileTooLarge Ldev/kord/rest/json/JsonErrorCode;
public static final field General Ldev/kord/rest/json/JsonErrorCode;
public static final field GiftRequiresPaymentSource Ldev/kord/rest/json/JsonErrorCode;
Expand Down Expand Up @@ -1946,8 +1949,10 @@ public final class dev/kord/rest/json/JsonErrorCode : java/lang/Enum {
public static final field MaxActiveAnnouncementThreads Ldev/kord/rest/json/JsonErrorCode;
public static final field MaxActiveThreads Ldev/kord/rest/json/JsonErrorCode;
public static final field MaxAnimatedEmojis Ldev/kord/rest/json/JsonErrorCode;
public static final field MaxApplicationCommands Ldev/kord/rest/json/JsonErrorCode;
public static final field MaxAttachments Ldev/kord/rest/json/JsonErrorCode;
public static final field MaxBanFetches Ldev/kord/rest/json/JsonErrorCode;
public static final field MaxDailyApplicationCommandCreates Ldev/kord/rest/json/JsonErrorCode;
public static final field MaxEmojis Ldev/kord/rest/json/JsonErrorCode;
public static final field MaxFriends Ldev/kord/rest/json/JsonErrorCode;
public static final field MaxGuildChannels Ldev/kord/rest/json/JsonErrorCode;
Expand All @@ -1972,6 +1977,7 @@ public final class dev/kord/rest/json/JsonErrorCode : java/lang/Enum {
public static final field MaxUncompletedGuildScheduledEvents Ldev/kord/rest/json/JsonErrorCode;
public static final field MaxWebhooks Ldev/kord/rest/json/JsonErrorCode;
public static final field MessageAlreadyHasThread Ldev/kord/rest/json/JsonErrorCode;
public static final field MessageBlockedByAutomaticModeration Ldev/kord/rest/json/JsonErrorCode;
public static final field MissingAccess Ldev/kord/rest/json/JsonErrorCode;
public static final field MissingOAuthScope Ldev/kord/rest/json/JsonErrorCode;
public static final field NoUsersWithDiscordTag Ldev/kord/rest/json/JsonErrorCode;
Expand All @@ -1982,6 +1988,7 @@ public final class dev/kord/rest/json/JsonErrorCode : java/lang/Enum {
public static final field OnlyOwner Ldev/kord/rest/json/JsonErrorCode;
public static final field OperationOnAchievedThread Ldev/kord/rest/json/JsonErrorCode;
public static final field OperationOnArchivedThread Ldev/kord/rest/json/JsonErrorCode;
public static final field OwnershipCannotBeTransferredToBot Ldev/kord/rest/json/JsonErrorCode;
public static final field PermissionLack Ldev/kord/rest/json/JsonErrorCode;
public static final field ProvidedMessageCountInsufficient Ldev/kord/rest/json/JsonErrorCode;
public static final field RasterizedImagesInLotties Ldev/kord/rest/json/JsonErrorCode;
Expand All @@ -1998,6 +2005,7 @@ public final class dev/kord/rest/json/JsonErrorCode : java/lang/Enum {
public static final field StickerPermissionLack Ldev/kord/rest/json/JsonErrorCode;
public static final field TemporarilyDisabled Ldev/kord/rest/json/JsonErrorCode;
public static final field TheadLocked Ldev/kord/rest/json/JsonErrorCode;
public static final field TitleBlockedByAutomaticModeration Ldev/kord/rest/json/JsonErrorCode;
public static final field TooFastDM Ldev/kord/rest/json/JsonErrorCode;
public static final field TooLongNote Ldev/kord/rest/json/JsonErrorCode;
public static final field Unauthorized Ldev/kord/rest/json/JsonErrorCode;
Expand Down Expand Up @@ -2041,6 +2049,7 @@ public final class dev/kord/rest/json/JsonErrorCode : java/lang/Enum {
public static final field UnknownStoreListing Ldev/kord/rest/json/JsonErrorCode;
public static final field UnknownStream Ldev/kord/rest/json/JsonErrorCode;
public static final field UnknownToken Ldev/kord/rest/json/JsonErrorCode;
public static final field UnknownUpload Ldev/kord/rest/json/JsonErrorCode;
public static final field UnknownUser Ldev/kord/rest/json/JsonErrorCode;
public static final field UnknownVoiceState Ldev/kord/rest/json/JsonErrorCode;
public static final field UnknownWebhook Ldev/kord/rest/json/JsonErrorCode;
Expand Down Expand Up @@ -2520,7 +2529,7 @@ public final class dev/kord/rest/json/request/CurrentVoiceStateModifyRequest {
public static synthetic fun copy$default (Ldev/kord/rest/json/request/CurrentVoiceStateModifyRequest;Ldev/kord/common/entity/Snowflake;Ldev/kord/common/entity/optional/OptionalBoolean;Ldev/kord/common/entity/optional/Optional;ILjava/lang/Object;)Ldev/kord/rest/json/request/CurrentVoiceStateModifyRequest;
public fun equals (Ljava/lang/Object;)Z
public final fun getChannelId ()Ldev/kord/common/entity/Snowflake;
public final fun getRequestToSpeakTimeStamp ()Ldev/kord/common/entity/optional/Optional;
public final synthetic fun getRequestToSpeakTimeStamp ()Ldev/kord/common/entity/optional/Optional;
public final fun getRequestToSpeakTimestamp ()Ldev/kord/common/entity/optional/Optional;
public final fun getSuppress ()Ldev/kord/common/entity/optional/OptionalBoolean;
public fun hashCode ()I
Expand Down Expand Up @@ -3460,7 +3469,7 @@ public final class dev/kord/rest/json/request/GuildRoleCreateRequest {
public final fun getMentionable ()Ldev/kord/common/entity/optional/OptionalBoolean;
public final fun getName ()Ldev/kord/common/entity/optional/Optional;
public final fun getPermissions ()Ldev/kord/common/entity/optional/Optional;
public final fun getSeparate ()Ldev/kord/common/entity/optional/OptionalBoolean;
public final synthetic fun getSeparate ()Ldev/kord/common/entity/optional/OptionalBoolean;
public final fun getUnicodeEmoji ()Ldev/kord/common/entity/optional/Optional;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
Expand Down Expand Up @@ -3505,7 +3514,7 @@ public final class dev/kord/rest/json/request/GuildRoleModifyRequest {
public final fun getMentionable ()Ldev/kord/common/entity/optional/OptionalBoolean;
public final fun getName ()Ldev/kord/common/entity/optional/Optional;
public final fun getPermissions ()Ldev/kord/common/entity/optional/Optional;
public final fun getSeparate ()Ldev/kord/common/entity/optional/OptionalBoolean;
public final synthetic fun getSeparate ()Ldev/kord/common/entity/optional/OptionalBoolean;
public final fun getUnicodeEmoji ()Ldev/kord/common/entity/optional/Optional;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
Expand Down Expand Up @@ -5424,7 +5433,7 @@ public final class dev/kord/rest/request/RequestBuilder {
public final fun getBaseUrl ()Ljava/lang/String;
public final fun getKeys ()Ljava/util/Map;
public final fun getRoute ()Ldev/kord/rest/route/Route;
public final fun header (Ljava/lang/String;Ljava/lang/String;)V
public final synthetic fun header (Ljava/lang/String;Ljava/lang/String;)V
public final fun parameter (Ljava/lang/String;Ldev/kord/common/entity/Snowflake;)V
public final fun parameter (Ljava/lang/String;Ljava/lang/Object;)V
public final fun set (Ljava/util/Map;Ldev/kord/rest/route/Route$Key;Ldev/kord/common/entity/Snowflake;)V
Expand Down Expand Up @@ -6446,7 +6455,7 @@ public final class dev/kord/rest/service/GuildService : dev/kord/rest/service/Re
public final fun getGuildBans (Ldev/kord/common/entity/Snowflake;Ldev/kord/rest/route/Position$BeforeOrAfter;Ljava/lang/Integer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public static synthetic fun getGuildBans$default (Ldev/kord/rest/service/GuildService;Ldev/kord/common/entity/Snowflake;Ldev/kord/rest/route/Position$BeforeOrAfter;Ljava/lang/Integer;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
public final fun getGuildChannels (Ldev/kord/common/entity/Snowflake;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun getGuildEmbed (Ldev/kord/common/entity/Snowflake;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final synthetic fun getGuildEmbed (Ldev/kord/common/entity/Snowflake;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun getGuildIntegrations (Ldev/kord/common/entity/Snowflake;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun getGuildInvites (Ldev/kord/common/entity/Snowflake;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun getGuildMember (Ldev/kord/common/entity/Snowflake;Ldev/kord/common/entity/Snowflake;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
Expand Down Expand Up @@ -6477,7 +6486,7 @@ public final class dev/kord/rest/service/GuildService : dev/kord/rest/service/Re
public final fun modifyCurrentVoiceState (Ldev/kord/common/entity/Snowflake;Ldev/kord/rest/json/request/CurrentVoiceStateModifyRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun modifyGuild (Ldev/kord/common/entity/Snowflake;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun modifyGuildChannelPosition (Ldev/kord/common/entity/Snowflake;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun modifyGuildEmbed (Ldev/kord/common/entity/Snowflake;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final synthetic fun modifyGuildEmbed (Ldev/kord/common/entity/Snowflake;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun modifyGuildIntegration (Ldev/kord/common/entity/Snowflake;Ldev/kord/common/entity/Snowflake;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun modifyGuildMFALevel (Ldev/kord/common/entity/Snowflake;Ldev/kord/common/entity/MFALevel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun modifyGuildMember (Ldev/kord/common/entity/Snowflake;Ldev/kord/common/entity/Snowflake;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
Expand Down Expand Up @@ -6540,7 +6549,7 @@ public final class dev/kord/rest/service/InteractionService : dev/kord/rest/serv
public final fun createModalInteractionResponse (Ldev/kord/common/entity/Snowflake;Ljava/lang/String;Ldev/kord/common/entity/DiscordModal;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun createModalInteractionResponse (Ldev/kord/common/entity/Snowflake;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun createNumberAutoCompleteInteractionResponse (Ldev/kord/common/entity/Snowflake;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun createPublicInteractionResponse (Ldev/kord/common/entity/Snowflake;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final synthetic fun createPublicInteractionResponse (Ldev/kord/common/entity/Snowflake;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public static synthetic fun createPublicInteractionResponse$default (Ldev/kord/rest/service/InteractionService;Ldev/kord/common/entity/Snowflake;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
public final fun createStringAutoCompleteInteractionResponse (Ldev/kord/common/entity/Snowflake;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public final fun deferMessage (Ldev/kord/common/entity/Snowflake;Ljava/lang/String;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
Expand Down
10 changes: 5 additions & 5 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fun VersionCatalogBuilder.kotlinx() {
}

fun VersionCatalogBuilder.ktor() {
val ktor = version("ktor", "2.0.3")
val ktor = version("ktor", "2.1.0")

library("ktor-client-json", "io.ktor", "ktor-serialization-kotlinx-json").versionRef(ktor)
library("ktor-client-content-negotiation", "io.ktor", "ktor-client-content-negotiation").versionRef(ktor)
Expand All @@ -69,19 +69,19 @@ fun VersionCatalogBuilder.ktor() {
}

fun VersionCatalogBuilder.common() {
version("kotlinx-coroutines", "1.6.3")
version("kotlinx-coroutines", "1.6.4")
library("kotlinx-serialization", "org.jetbrains.kotlinx", "kotlinx-serialization-json").version("1.3.3")
library("kotlinx-coroutines", "org.jetbrains.kotlinx", "kotlinx-coroutines-core").versionRef("kotlinx-coroutines")
library("kotlinx-atomicfu", "org.jetbrains.kotlinx", "atomicfu").version("0.18.2")
library("kotlinx-atomicfu", "org.jetbrains.kotlinx", "atomicfu").version("0.18.3")
library("kotlin-logging", "io.github.microutils", "kotlin-logging").version("2.1.23")

bundle("common", listOf("kotlinx-serialization", "kotlinx-coroutines", "kotlinx-atomicfu", "kotlin-logging"))
}

fun VersionCatalogBuilder.tests() {
val junit5 = version("junit5", "5.8.2")
val junit5 = version("junit5", "5.9.0")

library("mockk", "io.mockk", "mockk").version("1.12.4")
library("mockk", "io.mockk", "mockk").version("1.12.5")
library("kotlinx-coroutines-test", "org.jetbrains.kotlinx", "kotlinx-coroutines-test").versionRef("kotlinx-coroutines")
library("junit-jupiter-api", "org.junit.jupiter", "junit-jupiter-api").versionRef(junit5)

Expand Down
Loading

0 comments on commit f05cfa8

Please sign in to comment.