Skip to content

Commit 1596edb

Browse files
authored
[FIX] Up versions (#87)
1 parent 9687bb3 commit 1596edb

38 files changed

Lines changed: 155 additions & 134 deletions

File tree

.github/workflows/call-build-project.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
task: ":instances:neoforge:build --info --stacktrace"
1515
steps:
1616
- name: Checkout Git repo
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
- name: Set up JDK 21
19-
uses: actions/setup-java@v4
19+
uses: actions/setup-java@v5
2020
with:
2121
distribution: 'adopt'
2222
java-version: 21

.github/workflows/call-detekt-validation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ jobs:
66
name: "Check project by detekt"
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v6
1010
- name: Set up JDK 21
11-
uses: actions/setup-java@v4
11+
uses: actions/setup-java@v5
1212
with:
1313
distribution: 'temurin'
1414
java-version: '21'

.github/workflows/call-gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
name: "Gradle Wrapper Validation"
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v6
1111
- name: Validate Gradle Wrapper
1212
uses: gradle/wrapper-validation-action@v3

.github/workflows/call-tests-validation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77
name: "Run tests"
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v6
1111
- name: Set up JDK 21
12-
uses: actions/setup-java@v4
12+
uses: actions/setup-java@v5
1313
with:
1414
distribution: 'adopt'
1515
java-version: '21'

.github/workflows/call-upload-artifacts.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
task: ":instances:neoforge:shadowJar"
1515
steps:
1616
- name: Checkout Git repo
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
- uses: christian-draeger/read-properties@1.1.1
1919
id: properties
2020
with:
2121
path: './gradle.properties'
22-
properties: 'makeevrserg.project.name'
22+
properties: 'klibs.project.name'
2323
- name: Set up JDK 21
24-
uses: actions/setup-java@v4
24+
uses: actions/setup-java@v5
2525
with:
2626
distribution: 'adopt'
2727
java-version: 21
@@ -35,4 +35,4 @@ jobs:
3535
name: "Upload ${{ matrix.id }}"
3636
with:
3737
name: ${{ matrix.id }}
38-
path: ./jars/${{ steps.properties.outputs.makeevrserg-project-name }}-${{ matrix.id }}*.jar
38+
path: ./jars/${{ steps.properties.outputs.klibs-project-name }}-${{ matrix.id }}*.jar

.github/workflows/call-upload-github-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout Git repo
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414

1515
- uses: christian-draeger/read-properties@1.1.1
1616
id: properties
1717
with:
1818
path: './gradle.properties'
19-
properties: 'makeevrserg.project.name makeevrserg.project.version.string'
19+
properties: 'klibs.project.name klibs.project.version.string'
2020

2121
- uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
2222
name: "Download bukkit"
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
files: |
4040
./jars/*.jar
41-
tag_name: ${{ steps.properties.outputs.makeevrserg-project-version-string }}
42-
name: ${{ steps.properties.outputs.makeevrserg-project-name }} - ${{ steps.properties.outputs.makeevrserg-project-version-string }}
41+
tag_name: ${{ steps.properties.outputs.klibs-project-version-string }}
42+
name: ${{ steps.properties.outputs.klibs-project-name }} - ${{ steps.properties.outputs.klibs-project-version-string }}
4343
draft: false
4444
prerelease: false

.github/workflows/call-upload-modrinth-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
task: ":instances:neoforge:shadowJar"
1818
steps:
1919
- name: Checkout Git repo
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121

2222
- uses: christian-draeger/read-properties@1.1.1
2323
id: properties
2424
with:
2525
path: './gradle.properties'
26-
properties: 'makeevrserg.project.name makeevrserg.project.version.string'
26+
properties: 'klibs.project.name klibs.project.version.string'
2727

2828
- uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
2929
name: "Download ${{ matrix.id }}"
@@ -36,8 +36,8 @@ jobs:
3636
# your assets on Modrinth.
3737
modrinth-id: tnr41XhG
3838
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
39-
name: ${{ steps.properties.outputs.makeevrserg-project-name }}-${{ matrix.id }}
40-
version: ${{ steps.properties.outputs.makeevrserg-project-version-string }}
39+
name: ${{ steps.properties.outputs.klibs-project-name }}-${{ matrix.id }}
40+
version: ${{ steps.properties.outputs.klibs-project-version-string }}
4141
changelog: ${{ join(github.event.commits.*.message, '\n') }}
4242
version_type: beta
4343
java: |

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ plugins {
2525

2626
apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root")
2727
apply(plugin = "ru.astrainteractive.gradleplugin.detekt")
28-
apply(plugin = "ru.astrainteractive.gradleplugin.root.info")
28+
apply(plugin = "ru.astrainteractive.gradleplugin.rootinfo")
2929

3030
subprojects.forEach {
3131
it.apply(plugin = "ru.astrainteractive.gradleplugin.dokka.module")

gradle.properties

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ org.gradle.jvmargs=-Xmx5g -XX:+UseParallelGC -Dkotlin.daemon.jvm.options\="-Xmx5
77
kotlin.code.style=official
88
testTask.ignoreFailures=false
99
# Java
10-
makeevrserg.java.source=8
11-
makeevrserg.java.target=21
12-
makeevrserg.java.ktarget=21
10+
klibs.java.source=8
11+
klibs.java.target=21
12+
klibs.java.ktarget=21
1313
# Project
14-
makeevrserg.project.name=SoulKeeper
15-
makeevrserg.project.group=ru.astrainteractive.soulkeeper
16-
makeevrserg.project.version.string=1.6.1
17-
makeevrserg.project.description=Keep your items after death
18-
makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
19-
makeevrserg.project.url=https://github.com/Astra-Interactive/SoulKeeper
20-
makeevrserg.publish.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
14+
klibs.project.name=SoulKeeper
15+
klibs.project.group=ru.astrainteractive.soulkeeper
16+
klibs.project.version.string=1.7.0
17+
klibs.project.description=Keep your items after death
18+
klibs.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
19+
klibs.project.url=https://github.com/Astra-Interactive/SoulKeeper
20+
klibs.publish.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com

gradle/libs.versions.toml

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
[versions]
22
cache4k = "0.14.0"
3-
discordsrv = "1.30.4"
3+
discordsrv = "1.30.5"
44
driver-h2 = "2.4.240"
5-
driver-jdbc = "3.51.2.0"
6-
driver-mariadb = "3.5.7"
5+
driver-jdbc = "3.53.0.0"
6+
driver-mariadb = "3.5.8"
77
driver-mysql = "8.0.33"
8-
exposed = "0.61.0"
8+
exposed = "1.2.0"
99
forgegradle = "[6.0,6.2)"
10-
gradle-buildconfig = "6.0.7"
10+
gradle-buildconfig = "6.0.9"
1111
gradle-ftp = "0.1.3"
12-
gradle-shadow = "9.2.2"
13-
gson = "2.13.2"
14-
guava = "33.5.0-jre"
15-
jda = "6.3.1"
12+
gradle-shadow = "9.4.1"
13+
gson = "2.14.0"
14+
guava = "33.6.0-jre"
15+
jda = "6.4.1"
1616
jda-webhook = "0.8.4"
17-
klibs-gradleplugin = "1.15.0"
17+
jmh-core = "1.37"
18+
joml = "1.10.8"
19+
klibs-gradleplugin = "2.0.0"
1820
klibs-kdi = "1.4.8"
19-
klibs-kstorage = "4.5.0"
20-
klibs-mikro = "1.22.0"
21+
klibs-kstorage = "5.0.4"
22+
klibs-mikro = "1.23.0"
2123
kotlin-benchmark = "0.4.16"
2224
kotlin-coroutines = "1.10.2"
2325
kotlin-datetime = "0.7.1-0.6.x-compat"
24-
kotlin-json = "1.10.0"
25-
kotlin-serialization = "1.10.0"
26+
kotlin-json = "1.11.0"
27+
kotlin-serialization = "1.11.0"
2628
kotlin-serialization-kaml = "0.104.0"
2729
kotlin-version = "2.2.0"
28-
ktor = "3.4.0"
30+
ktor = "3.4.3"
2931
minecraft-astralibs = "3.35.0"
32+
minecraft-brigadier = "1.3.10"
3033
minecraft-bstats = "3.2.1"
31-
minecraft-bungee = "1.21-R0.5-SNAPSHOT"
34+
minecraft-bungee = "26.1-R0.1-SNAPSHOT"
35+
minecraft-datafixerupper = "8.0.16"
3236
minecraft-essentialsx = "2.21.2"
3337
minecraft-fabric-api = "0.139.5+"
38+
minecraft-fabric-yarn = "1.20.1+build.10"
3439
minecraft-fabric-kotlin = "1.13.7+"
35-
minecraft-fabric-loader = "0.18.2"
36-
minecraft-fabric-loom = "1.14.6"
37-
minecraft-kyori = "4.26.1"
40+
minecraft-fabric-loader = "0.19.2"
41+
minecraft-fabric-loom = "1.16.1"
42+
minecraft-kyori = "5.0.1"
3843
minecraft-luckperms = "5.5"
3944
minecraft-mcprotocollib = "1.21.7-SNAPSHOT"
40-
minecraft-mockbukkit = "4.33.2"
41-
minecraft-mojang-version = "1.20.1"
42-
minecraft-neoforgeversion = "21.1.129"
45+
minecraft-mockbukkit = "4.108.0"
46+
minecraft-mojang-version = "1.21.11"
4347
minecraft-neoforged-bus = "8.0.2"
44-
minecraft-packetevents = "2.11.2"
48+
minecraft-neoforgegradle = "7.1.20"
49+
minecraft-neoforgeversion = "21.1.129"
50+
minecraft-packetevents = "2.12.1"
4551
minecraft-papi = "2.12.2"
4652
minecraft-protocollib = "5.3.0"
4753
minecraft-spigot = "1.21.9-R0.1-SNAPSHOT"
4854
minecraft-towny = "0.102.0.0"
4955
minecraft-vault = "1.7.1"
5056
minecraft-velocity = "4.0.0-SNAPSHOT"
51-
minecraft-neoforgegradle = "7.1.20"
52-
minecraft-forgeversion = "47.2.20"
53-
minecraft-brigadier = "1.3.10"
54-
minecraft-datafixerupper = "8.0.16"
55-
joml = "1.10.8"
56-
telegrambots = "9.4.0"
57+
telegrambots = "9.5.0"
5758
tests-junit-bom = "6.0.3"
5859
tests-junit-jupiter-api = "6.0.3"
59-
tests-mockito = "5.22.0"
60+
tests-mockito = "5.23.0"
6061
tests-org-testing = "7.12.0"
6162
tests-turbine = "1.2.1"
62-
jmh-core = "1.37"
6363

6464
[libraries]
6565
cache4k = { module = "io.github.reactivecircus.cache4k:cache4k-jvm", version.ref = "cache4k" }
@@ -75,6 +75,8 @@ exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "e
7575
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
7676
guava = { module = "com.google.guava:guava", version.ref = "guava" }
7777
jda = { module = "net.dv8tion:JDA", version.ref = "jda" }
78+
jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core" }
79+
joml = { module = "org.joml:joml", version.ref = "joml" }
7880
klibs-kdi = { module = "ru.astrainteractive.klibs:kdi-jvm", version.ref = "klibs-kdi" }
7981
klibs-kstorage = { module = "ru.astrainteractive.klibs:kstorage", version.ref = "klibs-kstorage" }
8082
klibs-mikro-core = { module = "ru.astrainteractive.klibs:mikro-core", version.ref = "klibs-mikro" }
@@ -105,24 +107,26 @@ minecraft-astralibs-core-neoforge = { module = "ru.astrainteractive.astralibs:co
105107
minecraft-astralibs-exposed = { module = "ru.astrainteractive.astralibs:exposed", version.ref = "minecraft-astralibs" }
106108
minecraft-astralibs-menu-bukkit = { module = "ru.astrainteractive.astralibs:menu-bukkit", version.ref = "minecraft-astralibs" }
107109
minecraft-astralibs-orm = { module = "ru.astrainteractive.astralibs:orm", version.ref = "minecraft-astralibs" }
110+
minecraft-brigadier = { module = "com.mojang:brigadier", version.ref = "minecraft-brigadier" }
108111
minecraft-bstats = { module = "org.bstats:bstats-bukkit", version.ref = "minecraft-bstats" }
109112
minecraft-bungee = { module = "net.md-5:bungeecord-api", version.ref = "minecraft-bungee" }
113+
minecraft-datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "minecraft-datafixerupper" }
110114
minecraft-discordsrv = { module = "com.discordsrv:discordsrv", version.ref = "discordsrv" }
111115
minecraft-essentialsx = { module = "net.essentialsx:EssentialsX", version.ref = "minecraft-essentialsx" }
112116
minecraft-fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "minecraft-fabric-api" }
113117
minecraft-fabric-kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "minecraft-fabric-kotlin" }
114118
minecraft-fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "minecraft-fabric-loader" }
115119
minecraft-fabric-mojang = { module = "com.mojang:minecraft", version.ref = "minecraft-mojang-version" }
116-
minecraft-kyori-plain = { module = "net.kyori:adventure-text-serializer-plain", version.ref = "minecraft-kyori" }
117120
minecraft-kyori-api = { module = "net.kyori:adventure-api", version.ref = "minecraft-kyori" }
118121
minecraft-kyori-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "minecraft-kyori" }
119122
minecraft-kyori-legacy = { module = "net.kyori:adventure-text-serializer-legacy", version.ref = "minecraft-kyori" }
120123
minecraft-kyori-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "minecraft-kyori" }
124+
minecraft-kyori-plain = { module = "net.kyori:adventure-text-serializer-plain", version.ref = "minecraft-kyori" }
121125
minecraft-luckperms = { module = "net.luckperms:api", version.ref = "minecraft-luckperms" }
122126
minecraft-mcprotocollib = { module = "org.geysermc.mcprotocollib:protocol", version.ref = "minecraft-mcprotocollib" }
123127
minecraft-mockbukkit = { module = "com.github.MockBukkit:MockBukkit", version.ref = "minecraft-mockbukkit" }
124-
minecraft-neoforgeversion = { module = "net.neoforged:neoforge", version.ref = "minecraft-neoforgeversion" }
125128
minecraft-neoforged-bus = { module = "net.neoforged:bus", version.ref = "minecraft-neoforged-bus" }
129+
minecraft-neoforgeversion = { module = "net.neoforged:neoforge", version.ref = "minecraft-neoforgeversion" }
126130
minecraft-packetevents = { module = "com.github.retrooper:packetevents-spigot", version.ref = "minecraft-packetevents" }
127131
minecraft-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-spigot" }
128132
minecraft-papi = { module = "me.clip:placeholderapi", version.ref = "minecraft-papi" }
@@ -132,8 +136,6 @@ minecraft-spigot-core = { module = "org.spigotmc:spigot", version.ref = "minecra
132136
minecraft-towny = { module = "com.palmergames.bukkit.towny:towny", version.ref = "minecraft-towny" }
133137
minecraft-vaultapi = { module = "com.github.MilkBowl:VaultAPI", version.ref = "minecraft-vault" }
134138
minecraft-velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "minecraft-velocity" }
135-
minecraft-brigadier = { module = "com.mojang:brigadier", version.ref = "minecraft-brigadier" }
136-
minecraft-datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "minecraft-datafixerupper" }
137139
telegrambots-client = { module = "org.telegram:telegrambots-client", version.ref = "telegrambots" }
138140
telegrambots-extensions = { module = "org.telegram:telegrambots-extensions", version.ref = "telegrambots" }
139141
telegrambots-longpolling = { module = "org.telegram:telegrambots-longpolling", version.ref = "telegrambots" }
@@ -145,8 +147,7 @@ tests-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }
145147
tests-mockito = { module = "org.mockito:mockito-core", version.ref = "tests-mockito" }
146148
tests-org-testing = { module = "org.testng:testng", version.ref = "tests-org-testing" }
147149
tests-turbine = { module = "app.cash.turbine:turbine", version.ref = "tests-turbine" }
148-
jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core" }
149-
joml = { module = "org.joml:joml", version.ref = "joml" }
150+
150151
[plugins]
151152
gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" }
152153
gradle-fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" }
@@ -163,13 +164,13 @@ klibs-gradle-java-version = { id = "ru.astrainteractive.gradleplugin.java.versio
163164
klibs-gradle-minecraft-empty = { id = "ru.astrainteractive.gradleplugin.minecraft.empty", version.ref = "klibs-gradleplugin" }
164165
klibs-gradle-minecraft-multiplatform = { id = "ru.astrainteractive.gradleplugin.minecraft.multiplatform", version.ref = "klibs-gradleplugin" }
165166
klibs-gradle-publication = { id = "ru.astrainteractive.gradleplugin.publication", version.ref = "klibs-gradleplugin" }
166-
klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.root.info", version.ref = "klibs-gradleplugin" }
167+
klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.rootinfo", version.ref = "klibs-gradleplugin" }
167168
klibs-gradle-stub-javadoc = { id = "ru.astrainteractive.gradleplugin.stub.javadoc", version.ref = "klibs-gradleplugin" }
168-
klibs-minecraft-resource-processor = { id = "ru.astrainteractive.gradleplugin.minecraft.resource-processor", version.ref = "klibs-gradleplugin" }
169+
klibs-minecraft-resource-processor = { id = "ru.astrainteractive.gradleplugin.minecraft.resource.processor", version.ref = "klibs-gradleplugin" }
169170
klibs-minecraft-shadow = { id = "ru.astrainteractive.gradleplugin.minecraft.shadow", version.ref = "klibs-gradleplugin" }
170171
kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin-version" }
171172
kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlin-benchmark" }
172173
kotlin-gradle = { id = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" }
173174
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
174175
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" }
175-
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" }
176+
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" }

0 commit comments

Comments
 (0)