Skip to content

Commit a7d0a38

Browse files
committed
feat: add kotlin serialization
1 parent 5cc8d1e commit a7d0a38

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ org.gradle.parallel=true
22
org.gradle.daemon=true
33
kotlin.stdlib.default.dependency=false
44
kapt.use.k2=true
5+
org.gradle.jvmargs=-Xmx4G
56

67
javaVersion=21
78
mcVersion=1.21.4
89

910
group=dev.slne.surf
10-
version=1.21.4-2.1.2-SNAPSHOT
11+
version=1.21.4-2.1.3-SNAPSHOT
1112
relocationPrefix=dev.slne.surf.surfapi.libs

gradle/libs.versions.toml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
paper-api = "1.21.4-R0.1-SNAPSHOT"
44

55
# Kolin
6-
kotlinVersion = "2.1.0"
7-
kotlinxCoroutines = "1.10.0"
6+
kotlinVersion = "2.1.10"
7+
kotlinxCoroutines = "1.10.1"
8+
kotlinx-serialization = "1.8.0"
89

910
# Packet Events
1011
packetevents = "2.7.0"
@@ -54,8 +55,8 @@ auto-service = "1.1.1"
5455

5556
# Plugin versions
5657
maven-repo-auth = "3.0.4"
57-
shadow-gradle-plugin = "9.0.0-beta4"
58-
ksp-gradle-plugin = "2.1.0-1.0.29"
58+
shadow-gradle-plugin = "9.0.0-beta7"
59+
ksp-gradle-plugin = "2.1.10-1.0.29"
5960
run-paper-gradle-plugin = "2.3.1"
6061

6162

@@ -68,6 +69,7 @@ kotlinxCoroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-co
6869
kotlinxCoroutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "kotlinxCoroutines" }
6970
kotlinxCoroutines-reactive = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactive", version.ref = "kotlinxCoroutines" }
7071
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlinVersion" }
72+
kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
7173

7274
# Packet Events
7375
packetevents-spigot = { module = "com.github.retrooper:packetevents-spigot", version.ref = "packetevents" }
@@ -140,6 +142,7 @@ auto-service = { module = "com.google.auto.service:auto-service", version.ref =
140142
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
141143
kotlin-all-open = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlinVersion" }
142144
kotlin-no-arg = { module = "org.jetbrains.kotlin:kotlin-noarg", version.ref = "kotlinVersion" }
145+
kotlin-serialization = { module = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin", version.ref = "kotlinVersion" }
143146
maven-repo-auth = { module = "org.hibernate.build.maven-repo-auth:org.hibernate.build.maven-repo-auth.gradle.plugin", version.ref = "maven-repo-auth" }
144147
shadow-gradle-plugin = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow-gradle-plugin" }
145148
ksp-gradle-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp-gradle-plugin" }

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies {
3030
api(libs.kotlinxCoroutines.reactive)
3131
api(libs.kotlinxCoroutines.reactor)
3232
api(libs.kotlin.reflect)
33+
api(libs.kotlin.serialization.json)
3334

3435
compileOnlyApi(libs.guava)
3536
compileOnlyApi(libs.caffeine)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ plugins {
1515
}
1616

1717
group = groupId
18-
version = "$mcVersion-1.0.90-SNAPSHOT"
18+
version = "$mcVersion-1.0.91-SNAPSHOT"
1919

2020
repositories {
2121
mavenCentral()

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/common/CommonSurfPlugin.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import org.gradle.kotlin.dsl.configure
1313
import org.gradle.kotlin.dsl.dependencies
1414
import org.gradle.kotlin.dsl.repositories
1515
import org.gradle.kotlin.dsl.withType
16+
import org.jetbrains.kotlin.allopen.gradle.AllOpenExtension
1617
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
1718
import org.jetbrains.kotlin.gradle.utils.COMPILE_ONLY
1819

@@ -29,6 +30,7 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
2930
"org.jetbrains.kotlin.kapt",
3031
"org.jetbrains.kotlin.plugin.spring",
3132
"org.jetbrains.kotlin.plugin.jpa",
33+
"org.jetbrains.kotlin.plugin.serialization",
3234
"com.gradleup.shadow"
3335
)
3436

@@ -149,6 +151,7 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
149151

150152
configureAutoService()
151153
configureKotlin()
154+
configureAllOpen()
152155
configure0()
153156
}
154157

@@ -160,6 +163,12 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
160163
}
161164
}
162165

166+
private fun Project.configureAllOpen() = configure<AllOpenExtension> {
167+
annotation("jakarta.persistence.Entity")
168+
annotation("jakarta.persistence.MappedSuperclass")
169+
annotation("jakarta.persistence.Embeddable")
170+
}
171+
163172
private fun Project.configureAutoService() = dependencies {
164173
add(COMPILE_ONLY, Constants.AUTO_SERVICE_ANNOTATIONS)
165174
add("kapt", Constants.AUTO_SERVICE)

0 commit comments

Comments
 (0)