Skip to content

Commit d2c30fa

Browse files
committed
feat: update Kotlin serialization dependencies and bump version to 1.21.10-2.42.4
1 parent 7283f9e commit d2c30fa

File tree

8 files changed

+230
-8
lines changed

8 files changed

+230
-8
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
77
javaVersion=21
88
mcVersion=1.21.10
99
group=dev.slne.surf
10-
version=1.21.10-2.42.3
10+
version=1.21.10-2.42.4
1111
relocationPrefix=dev.slne.surf.surfapi.libs
1212
snapshot=false

gradle/libs.versions.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ kotlinxCoroutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines
8080
kotlinxCoroutines-reactive = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactive", version.ref = "kotlinxCoroutines" }
8181
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlinVersion" }
8282
kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
83+
kotlin-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlinx-serialization" }
8384

8485
# Packet Events
8586
packetevents-spigot = { module = "com.github.retrooper:packetevents-spigot", version.ref = "packetevents" }
@@ -185,4 +186,5 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp-version" }
185186
ktor-client = ["ktor-client-core", "ktor-client-okhttp", "ktor-client-content-negotiation", "ktor-serialization-kotlinx-json"]
186187
inventory-framework = ["inventory-framework-platform-paper", "inventory-framework-platform-bukkit"]
187188
reactor-netty = ["reactor-netty-core", "reactor-netty-http"]
188-
kotlin-coroutines = ["kotlinxCoroutines-core", "kotlinxCoroutines-reactor", "kotlinxCoroutines-reactive"]
189+
kotlin-coroutines = ["kotlinxCoroutines-core", "kotlinxCoroutines-reactor", "kotlinxCoroutines-reactive"]
190+
kotlin-serialization = ["kotlin-serialization-json", "kotlin-serialization-protobuf"]

surf-api-bukkit/surf-api-bukkit-api/api/surf-api-bukkit-api.api

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109823,6 +109823,78 @@ public final class kotlinx/serialization/modules/SerializersModuleKt {
109823109823
public static final fun plus (Lkotlinx/serialization/modules/SerializersModule;Lkotlinx/serialization/modules/SerializersModule;)Lkotlinx/serialization/modules/SerializersModule;
109824109824
}
109825109825

109826+
public abstract class kotlinx/serialization/protobuf/ProtoBuf : kotlinx/serialization/BinaryFormat {
109827+
public static final field Default Lkotlinx/serialization/protobuf/ProtoBuf$Default;
109828+
public synthetic fun <init> (ZLkotlinx/serialization/modules/SerializersModule;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
109829+
public fun decodeFromByteArray (Lkotlinx/serialization/DeserializationStrategy;[B)Ljava/lang/Object;
109830+
public fun encodeToByteArray (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)[B
109831+
public fun getSerializersModule ()Lkotlinx/serialization/modules/SerializersModule;
109832+
}
109833+
109834+
public final class kotlinx/serialization/protobuf/ProtoBuf$Default : kotlinx/serialization/protobuf/ProtoBuf {
109835+
}
109836+
109837+
public final class kotlinx/serialization/protobuf/ProtoBufBuilder {
109838+
public final fun getEncodeDefaults ()Z
109839+
public final fun getSerializersModule ()Lkotlinx/serialization/modules/SerializersModule;
109840+
public final fun setEncodeDefaults (Z)V
109841+
public final fun setSerializersModule (Lkotlinx/serialization/modules/SerializersModule;)V
109842+
}
109843+
109844+
public final class kotlinx/serialization/protobuf/ProtoBufKt {
109845+
public static final fun ProtoBuf (Lkotlinx/serialization/protobuf/ProtoBuf;Lkotlin/jvm/functions/Function1;)Lkotlinx/serialization/protobuf/ProtoBuf;
109846+
public static synthetic fun ProtoBuf$default (Lkotlinx/serialization/protobuf/ProtoBuf;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/serialization/protobuf/ProtoBuf;
109847+
}
109848+
109849+
public final class kotlinx/serialization/protobuf/ProtoIntegerType : java/lang/Enum {
109850+
public static final field DEFAULT Lkotlinx/serialization/protobuf/ProtoIntegerType;
109851+
public static final field FIXED Lkotlinx/serialization/protobuf/ProtoIntegerType;
109852+
public static final field SIGNED Lkotlinx/serialization/protobuf/ProtoIntegerType;
109853+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
109854+
public static fun valueOf (Ljava/lang/String;)Lkotlinx/serialization/protobuf/ProtoIntegerType;
109855+
public static fun values ()[Lkotlinx/serialization/protobuf/ProtoIntegerType;
109856+
}
109857+
109858+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoNumber : java/lang/annotation/Annotation {
109859+
public abstract fun number ()I
109860+
}
109861+
109862+
public final synthetic class kotlinx/serialization/protobuf/ProtoNumber$Impl : kotlinx/serialization/protobuf/ProtoNumber {
109863+
public fun <init> (I)V
109864+
public final synthetic fun number ()I
109865+
}
109866+
109867+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoOneOf : java/lang/annotation/Annotation {
109868+
}
109869+
109870+
public final synthetic class kotlinx/serialization/protobuf/ProtoOneOf$Impl : kotlinx/serialization/protobuf/ProtoOneOf {
109871+
public fun <init> ()V
109872+
}
109873+
109874+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoPacked : java/lang/annotation/Annotation {
109875+
}
109876+
109877+
public final synthetic class kotlinx/serialization/protobuf/ProtoPacked$Impl : kotlinx/serialization/protobuf/ProtoPacked {
109878+
public fun <init> ()V
109879+
}
109880+
109881+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoType : java/lang/annotation/Annotation {
109882+
public abstract fun type ()Lkotlinx/serialization/protobuf/ProtoIntegerType;
109883+
}
109884+
109885+
public final synthetic class kotlinx/serialization/protobuf/ProtoType$Impl : kotlinx/serialization/protobuf/ProtoType {
109886+
public fun <init> (Lkotlinx/serialization/protobuf/ProtoIntegerType;)V
109887+
public final synthetic fun type ()Lkotlinx/serialization/protobuf/ProtoIntegerType;
109888+
}
109889+
109890+
public final class kotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator {
109891+
public static final field INSTANCE Lkotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator;
109892+
public final fun generateSchemaText (Ljava/util/List;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
109893+
public final fun generateSchemaText (Lkotlinx/serialization/descriptors/SerialDescriptor;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
109894+
public static synthetic fun generateSchemaText$default (Lkotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Ljava/lang/String;
109895+
public static synthetic fun generateSchemaText$default (Lkotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator;Lkotlinx/serialization/descriptors/SerialDescriptor;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Ljava/lang/String;
109896+
}
109897+
109826109898
public final class me/devnatan/inventoryframework/AnvilInput : me/devnatan/inventoryframework/state/BaseMutableState, me/devnatan/inventoryframework/ViewConfig$Modifier {
109827109899
public fun apply (Lme/devnatan/inventoryframework/ViewConfigBuilder;Lme/devnatan/inventoryframework/context/IFContext;)V
109828109900
public static fun createAnvilInput ()Lme/devnatan/inventoryframework/AnvilInput;

surf-api-core/surf-api-core-api/api/surf-api-core-api.api

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107555,6 +107555,78 @@ public final class kotlinx/serialization/modules/SerializersModuleKt {
107555107555
public static final fun plus (Lkotlinx/serialization/modules/SerializersModule;Lkotlinx/serialization/modules/SerializersModule;)Lkotlinx/serialization/modules/SerializersModule;
107556107556
}
107557107557

107558+
public abstract class kotlinx/serialization/protobuf/ProtoBuf : kotlinx/serialization/BinaryFormat {
107559+
public static final field Default Lkotlinx/serialization/protobuf/ProtoBuf$Default;
107560+
public synthetic fun <init> (ZLkotlinx/serialization/modules/SerializersModule;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
107561+
public fun decodeFromByteArray (Lkotlinx/serialization/DeserializationStrategy;[B)Ljava/lang/Object;
107562+
public fun encodeToByteArray (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)[B
107563+
public fun getSerializersModule ()Lkotlinx/serialization/modules/SerializersModule;
107564+
}
107565+
107566+
public final class kotlinx/serialization/protobuf/ProtoBuf$Default : kotlinx/serialization/protobuf/ProtoBuf {
107567+
}
107568+
107569+
public final class kotlinx/serialization/protobuf/ProtoBufBuilder {
107570+
public final fun getEncodeDefaults ()Z
107571+
public final fun getSerializersModule ()Lkotlinx/serialization/modules/SerializersModule;
107572+
public final fun setEncodeDefaults (Z)V
107573+
public final fun setSerializersModule (Lkotlinx/serialization/modules/SerializersModule;)V
107574+
}
107575+
107576+
public final class kotlinx/serialization/protobuf/ProtoBufKt {
107577+
public static final fun ProtoBuf (Lkotlinx/serialization/protobuf/ProtoBuf;Lkotlin/jvm/functions/Function1;)Lkotlinx/serialization/protobuf/ProtoBuf;
107578+
public static synthetic fun ProtoBuf$default (Lkotlinx/serialization/protobuf/ProtoBuf;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/serialization/protobuf/ProtoBuf;
107579+
}
107580+
107581+
public final class kotlinx/serialization/protobuf/ProtoIntegerType : java/lang/Enum {
107582+
public static final field DEFAULT Lkotlinx/serialization/protobuf/ProtoIntegerType;
107583+
public static final field FIXED Lkotlinx/serialization/protobuf/ProtoIntegerType;
107584+
public static final field SIGNED Lkotlinx/serialization/protobuf/ProtoIntegerType;
107585+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
107586+
public static fun valueOf (Ljava/lang/String;)Lkotlinx/serialization/protobuf/ProtoIntegerType;
107587+
public static fun values ()[Lkotlinx/serialization/protobuf/ProtoIntegerType;
107588+
}
107589+
107590+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoNumber : java/lang/annotation/Annotation {
107591+
public abstract fun number ()I
107592+
}
107593+
107594+
public final synthetic class kotlinx/serialization/protobuf/ProtoNumber$Impl : kotlinx/serialization/protobuf/ProtoNumber {
107595+
public fun <init> (I)V
107596+
public final synthetic fun number ()I
107597+
}
107598+
107599+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoOneOf : java/lang/annotation/Annotation {
107600+
}
107601+
107602+
public final synthetic class kotlinx/serialization/protobuf/ProtoOneOf$Impl : kotlinx/serialization/protobuf/ProtoOneOf {
107603+
public fun <init> ()V
107604+
}
107605+
107606+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoPacked : java/lang/annotation/Annotation {
107607+
}
107608+
107609+
public final synthetic class kotlinx/serialization/protobuf/ProtoPacked$Impl : kotlinx/serialization/protobuf/ProtoPacked {
107610+
public fun <init> ()V
107611+
}
107612+
107613+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoType : java/lang/annotation/Annotation {
107614+
public abstract fun type ()Lkotlinx/serialization/protobuf/ProtoIntegerType;
107615+
}
107616+
107617+
public final synthetic class kotlinx/serialization/protobuf/ProtoType$Impl : kotlinx/serialization/protobuf/ProtoType {
107618+
public fun <init> (Lkotlinx/serialization/protobuf/ProtoIntegerType;)V
107619+
public final synthetic fun type ()Lkotlinx/serialization/protobuf/ProtoIntegerType;
107620+
}
107621+
107622+
public final class kotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator {
107623+
public static final field INSTANCE Lkotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator;
107624+
public final fun generateSchemaText (Ljava/util/List;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
107625+
public final fun generateSchemaText (Lkotlinx/serialization/descriptors/SerialDescriptor;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
107626+
public static synthetic fun generateSchemaText$default (Lkotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Ljava/lang/String;
107627+
public static synthetic fun generateSchemaText$default (Lkotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator;Lkotlinx/serialization/descriptors/SerialDescriptor;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Ljava/lang/String;
107628+
}
107629+
107558107630
public abstract interface class net/kyori/adventure/nbt/ArrayBinaryTag : net/kyori/adventure/nbt/BinaryTag {
107559107631
public abstract fun type ()Lnet/kyori/adventure/nbt/BinaryTagType;
107560107632
}

surf-api-core/surf-api-core-api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
api(libs.bundles.kotlin.coroutines)
3333
api(libs.bundles.reactor.netty)
3434
api(libs.kotlin.reflect)
35-
api(libs.kotlin.serialization.json)
35+
api(libs.bundles.kotlin.serialization)
3636

3737
compileOnlyApi(libs.guava)
3838
compileOnlyApi(libs.caffeine)

surf-api-gradle-plugin/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020
group = groupId
2121
version = buildString {
2222
append(mcVersion)
23-
append("-1.6.2")
23+
append("-1.6.3")
2424
if (snapshot) append("-SNAPSHOT")
2525
}
2626

@@ -33,7 +33,8 @@ val pluginDependencies = listOf(
3333
libs.kotlin.gradle.plugin,
3434
libs.kotlin.all.open,
3535
libs.kotlin.no.arg,
36-
libs.kotlin.serialization,
36+
libs.kotlin.serialization.json,
37+
libs.kotlin.serialization.protobuf,
3738
libs.shadow.gradle.plugin,
3839
libs.run.paper.gradle.plugin,
3940
libs.plugin.yml.paper.gradle.plugin,
@@ -45,7 +46,7 @@ dependencies {
4546
pluginDependencies.forEach { dep -> api(dep) }
4647

4748
implementation("com.palantir.javapoet:javapoet:0.6.0")
48-
implementation(libs.kotlin.serialization.json)
49+
implementation(libs.bundles.kotlin.serialization)
4950
}
5051

5152
gradlePlugin {

surf-api-modern-generator/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
}
1515

1616
dependencies {
17-
implementation(libs.kotlin.serialization.json)
17+
implementation(libs.bundles.kotlin.serialization)
1818

1919
implementation("com.squareup:javapoet:1.13.0")
2020
implementation("com.squareup:kotlinpoet:2.2.0")
@@ -86,7 +86,10 @@ val downloadRegistriesTask by tasks.register("downloadRegistries") {
8686
outputDir.resolve("reports").toPath()
8787
.moveTo(resourcesDir.toPath(), StandardCopyOption.REPLACE_EXISTING)
8888
outputDir.resolve("data").resolve("minecraft").resolve("advancement").toPath()
89-
.moveTo(resourcesDir.resolve("advancement").toPath(), StandardCopyOption.REPLACE_EXISTING)
89+
.moveTo(
90+
resourcesDir.resolve("advancement").toPath(),
91+
StandardCopyOption.REPLACE_EXISTING
92+
)
9093
outputDir.deleteRecursively()
9194

9295
println("Done!")

surf-api-velocity/surf-api-velocity-api/api/surf-api-velocity-api.api

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107865,6 +107865,78 @@ public final class kotlinx/serialization/modules/SerializersModuleKt {
107865107865
public static final fun plus (Lkotlinx/serialization/modules/SerializersModule;Lkotlinx/serialization/modules/SerializersModule;)Lkotlinx/serialization/modules/SerializersModule;
107866107866
}
107867107867

107868+
public abstract class kotlinx/serialization/protobuf/ProtoBuf : kotlinx/serialization/BinaryFormat {
107869+
public static final field Default Lkotlinx/serialization/protobuf/ProtoBuf$Default;
107870+
public synthetic fun <init> (ZLkotlinx/serialization/modules/SerializersModule;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
107871+
public fun decodeFromByteArray (Lkotlinx/serialization/DeserializationStrategy;[B)Ljava/lang/Object;
107872+
public fun encodeToByteArray (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)[B
107873+
public fun getSerializersModule ()Lkotlinx/serialization/modules/SerializersModule;
107874+
}
107875+
107876+
public final class kotlinx/serialization/protobuf/ProtoBuf$Default : kotlinx/serialization/protobuf/ProtoBuf {
107877+
}
107878+
107879+
public final class kotlinx/serialization/protobuf/ProtoBufBuilder {
107880+
public final fun getEncodeDefaults ()Z
107881+
public final fun getSerializersModule ()Lkotlinx/serialization/modules/SerializersModule;
107882+
public final fun setEncodeDefaults (Z)V
107883+
public final fun setSerializersModule (Lkotlinx/serialization/modules/SerializersModule;)V
107884+
}
107885+
107886+
public final class kotlinx/serialization/protobuf/ProtoBufKt {
107887+
public static final fun ProtoBuf (Lkotlinx/serialization/protobuf/ProtoBuf;Lkotlin/jvm/functions/Function1;)Lkotlinx/serialization/protobuf/ProtoBuf;
107888+
public static synthetic fun ProtoBuf$default (Lkotlinx/serialization/protobuf/ProtoBuf;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/serialization/protobuf/ProtoBuf;
107889+
}
107890+
107891+
public final class kotlinx/serialization/protobuf/ProtoIntegerType : java/lang/Enum {
107892+
public static final field DEFAULT Lkotlinx/serialization/protobuf/ProtoIntegerType;
107893+
public static final field FIXED Lkotlinx/serialization/protobuf/ProtoIntegerType;
107894+
public static final field SIGNED Lkotlinx/serialization/protobuf/ProtoIntegerType;
107895+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
107896+
public static fun valueOf (Ljava/lang/String;)Lkotlinx/serialization/protobuf/ProtoIntegerType;
107897+
public static fun values ()[Lkotlinx/serialization/protobuf/ProtoIntegerType;
107898+
}
107899+
107900+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoNumber : java/lang/annotation/Annotation {
107901+
public abstract fun number ()I
107902+
}
107903+
107904+
public final synthetic class kotlinx/serialization/protobuf/ProtoNumber$Impl : kotlinx/serialization/protobuf/ProtoNumber {
107905+
public fun <init> (I)V
107906+
public final synthetic fun number ()I
107907+
}
107908+
107909+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoOneOf : java/lang/annotation/Annotation {
107910+
}
107911+
107912+
public final synthetic class kotlinx/serialization/protobuf/ProtoOneOf$Impl : kotlinx/serialization/protobuf/ProtoOneOf {
107913+
public fun <init> ()V
107914+
}
107915+
107916+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoPacked : java/lang/annotation/Annotation {
107917+
}
107918+
107919+
public final synthetic class kotlinx/serialization/protobuf/ProtoPacked$Impl : kotlinx/serialization/protobuf/ProtoPacked {
107920+
public fun <init> ()V
107921+
}
107922+
107923+
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoType : java/lang/annotation/Annotation {
107924+
public abstract fun type ()Lkotlinx/serialization/protobuf/ProtoIntegerType;
107925+
}
107926+
107927+
public final synthetic class kotlinx/serialization/protobuf/ProtoType$Impl : kotlinx/serialization/protobuf/ProtoType {
107928+
public fun <init> (Lkotlinx/serialization/protobuf/ProtoIntegerType;)V
107929+
public final synthetic fun type ()Lkotlinx/serialization/protobuf/ProtoIntegerType;
107930+
}
107931+
107932+
public final class kotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator {
107933+
public static final field INSTANCE Lkotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator;
107934+
public final fun generateSchemaText (Ljava/util/List;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
107935+
public final fun generateSchemaText (Lkotlinx/serialization/descriptors/SerialDescriptor;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
107936+
public static synthetic fun generateSchemaText$default (Lkotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Ljava/lang/String;
107937+
public static synthetic fun generateSchemaText$default (Lkotlinx/serialization/protobuf/schema/ProtoBufSchemaGenerator;Lkotlinx/serialization/descriptors/SerialDescriptor;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Ljava/lang/String;
107938+
}
107939+
107868107940
public abstract interface class net/kyori/adventure/nbt/ArrayBinaryTag : net/kyori/adventure/nbt/BinaryTag {
107869107941
public abstract fun type ()Lnet/kyori/adventure/nbt/BinaryTagType;
107870107942
}

0 commit comments

Comments
 (0)