Skip to content

Commit 35f2594

Browse files
committed
build: Update Kotlin
1 parent 6268cc4 commit 35f2594

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
- Update required CommandAPI to 8.0.0+
1111
- Update required Mimic to 0.8.0+
12+
- Update Kotlin to 1.7.10
1213

1314
## [v0.1.2] (2022-01-07)
1415

buildSrc/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
dependencies {
6-
implementation(kotlin("gradle-plugin", version = "1.6.10"))
6+
implementation(kotlin("gradle-plugin", version = "1.7.10"))
77
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.0.0")
88
}
99

core/build.gradle.kts

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,17 @@ kotlin {
3232

3333
dependencies {
3434
compileOnly(spigotApi)
35-
compileOnly(libs.hocon)
35+
compileOnly(libs.serialization.core)
36+
compileOnly(libs.serialization.hocon)
3637
compileOnly(libs.mimic)
3738
compileOnly(libs.commandapi)
3839
compileOnly(libs.placeholderapi)
3940
compileOnly(libs.mysql)
4041
compileOnly(libs.hikaricp)
4142

4243
testImplementation(spigotApi)
43-
testImplementation(libs.hocon)
44+
testImplementation(libs.serialization.core)
45+
testImplementation(libs.serialization.hocon)
4446
testImplementation(libs.mimic)
4547
}
4648

core/src/main/resources/plugin.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ softdepend:
55
- PlaceholderAPI
66
- ProRPGItems # We want to use its ItemsRegistry.
77
libraries:
8-
- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10
9-
- org.jetbrains.kotlinx:kotlinx-serialization-hocon:1.3.2
8+
- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10
9+
- org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0
10+
- org.jetbrains.kotlinx:kotlinx-serialization-hocon:1.4.0
1011
- com.zaxxer:HikariCP:5.0.1
1112
permissions:
1213
ecinventory.open:

gradle/libs.versions.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
[versions]
2-
kotlin = "1.6.10"
2+
kotlin = "1.7.10"
33
bukkit = "1.19.2"
44

55
[libraries]
66
mimic = "ru.endlesscode.mimic:mimic-bukkit-api:0.8.0"
7-
hocon = "org.jetbrains.kotlinx:kotlinx-serialization-hocon:1.3.2"
7+
# TODO: Remove after the issue will be fixed https://github.com/Kotlin/kotlinx.serialization/issues/2019
8+
serialization-core = "org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0"
9+
serialization-hocon = "org.jetbrains.kotlinx:kotlinx-serialization-hocon:1.4.0"
810
commandapi = "dev.jorel:commandapi-core:8.5.1"
911
mysql = "mysql:mysql-connector-java:8.0.30"
1012
hikaricp = "com.zaxxer:HikariCP:5.0.1"

0 commit comments

Comments
 (0)