Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/call-build-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
task: ":instances:neoforge:build --info --stacktrace"
steps:
- name: Checkout Git repo
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'adopt'
java-version: 21
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/call-detekt-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jobs:
name: "Check project by detekt"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/call-gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jobs:
name: "Gradle Wrapper Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v3
4 changes: 2 additions & 2 deletions .github/workflows/call-tests-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
name: "Run tests"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'adopt'
java-version: '21'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/call-upload-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
task: ":instances:neoforge:shadowJar"
steps:
- name: Checkout Git repo
uses: actions/checkout@v4
uses: actions/checkout@v6
- uses: christian-draeger/read-properties@1.1.1
id: properties
with:
path: './gradle.properties'
properties: 'makeevrserg.project.name'
properties: 'klibs.project.name'
- name: Set up JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'adopt'
java-version: 21
Expand All @@ -35,4 +35,4 @@ jobs:
name: "Upload ${{ matrix.id }}"
with:
name: ${{ matrix.id }}
path: ./jars/${{ steps.properties.outputs.makeevrserg-project-name }}-${{ matrix.id }}*.jar
path: ./jars/${{ steps.properties.outputs.klibs-project-name }}-${{ matrix.id }}*.jar
8 changes: 4 additions & 4 deletions .github/workflows/call-upload-github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Git repo
uses: actions/checkout@v4
uses: actions/checkout@v6

- uses: christian-draeger/read-properties@1.1.1
id: properties
with:
path: './gradle.properties'
properties: 'makeevrserg.project.name makeevrserg.project.version.string'
properties: 'klibs.project.name klibs.project.version.string'

- uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
name: "Download bukkit"
Expand All @@ -38,7 +38,7 @@ jobs:
with:
files: |
./jars/*.jar
tag_name: ${{ steps.properties.outputs.makeevrserg-project-version-string }}
name: ${{ steps.properties.outputs.makeevrserg-project-name }} - ${{ steps.properties.outputs.makeevrserg-project-version-string }}
tag_name: ${{ steps.properties.outputs.klibs-project-version-string }}
name: ${{ steps.properties.outputs.klibs-project-name }} - ${{ steps.properties.outputs.klibs-project-version-string }}
draft: false
prerelease: false
8 changes: 4 additions & 4 deletions .github/workflows/call-upload-modrinth-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
task: ":instances:neoforge:shadowJar"
steps:
- name: Checkout Git repo
uses: actions/checkout@v4
uses: actions/checkout@v6

- uses: christian-draeger/read-properties@1.1.1
id: properties
with:
path: './gradle.properties'
properties: 'makeevrserg.project.name makeevrserg.project.version.string'
properties: 'klibs.project.name klibs.project.version.string'

- uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
name: "Download ${{ matrix.id }}"
Expand All @@ -36,8 +36,8 @@ jobs:
# your assets on Modrinth.
modrinth-id: tnr41XhG
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
name: ${{ steps.properties.outputs.makeevrserg-project-name }}-${{ matrix.id }}
version: ${{ steps.properties.outputs.makeevrserg-project-version-string }}
name: ${{ steps.properties.outputs.klibs-project-name }}-${{ matrix.id }}
version: ${{ steps.properties.outputs.klibs-project-version-string }}
changelog: ${{ join(github.event.commits.*.message, '\n') }}
version_type: beta
java: |
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ plugins {

apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root")
apply(plugin = "ru.astrainteractive.gradleplugin.detekt")
apply(plugin = "ru.astrainteractive.gradleplugin.root.info")
apply(plugin = "ru.astrainteractive.gradleplugin.rootinfo")

subprojects.forEach {
it.apply(plugin = "ru.astrainteractive.gradleplugin.dokka.module")
Expand Down
20 changes: 10 additions & 10 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ org.gradle.jvmargs=-Xmx5g -XX:+UseParallelGC -Dkotlin.daemon.jvm.options\="-Xmx5
kotlin.code.style=official
testTask.ignoreFailures=false
# Java
makeevrserg.java.source=8
makeevrserg.java.target=21
makeevrserg.java.ktarget=21
klibs.java.source=8
klibs.java.target=21
klibs.java.ktarget=21
# Project
makeevrserg.project.name=SoulKeeper
makeevrserg.project.group=ru.astrainteractive.soulkeeper
makeevrserg.project.version.string=1.6.1
makeevrserg.project.description=Keep your items after death
makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
makeevrserg.project.url=https://github.com/Astra-Interactive/SoulKeeper
makeevrserg.publish.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
klibs.project.name=SoulKeeper
klibs.project.group=ru.astrainteractive.soulkeeper
klibs.project.version.string=1.7.0
klibs.project.description=Keep your items after death
klibs.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
klibs.project.url=https://github.com/Astra-Interactive/SoulKeeper
klibs.publish.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
81 changes: 41 additions & 40 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
[versions]
cache4k = "0.14.0"
discordsrv = "1.30.4"
discordsrv = "1.30.5"
driver-h2 = "2.4.240"
driver-jdbc = "3.51.2.0"
driver-mariadb = "3.5.7"
driver-jdbc = "3.53.0.0"
driver-mariadb = "3.5.8"
driver-mysql = "8.0.33"
exposed = "0.61.0"
exposed = "1.2.0"
forgegradle = "[6.0,6.2)"
gradle-buildconfig = "6.0.7"
gradle-buildconfig = "6.0.9"
gradle-ftp = "0.1.3"
gradle-shadow = "9.2.2"
gson = "2.13.2"
guava = "33.5.0-jre"
jda = "6.3.1"
gradle-shadow = "9.4.1"
gson = "2.14.0"
guava = "33.6.0-jre"
jda = "6.4.1"
jda-webhook = "0.8.4"
klibs-gradleplugin = "1.15.0"
jmh-core = "1.37"
joml = "1.10.8"
klibs-gradleplugin = "2.0.0"
klibs-kdi = "1.4.8"
klibs-kstorage = "4.5.0"
klibs-mikro = "1.22.0"
klibs-kstorage = "5.0.4"
klibs-mikro = "1.23.0"
kotlin-benchmark = "0.4.16"
kotlin-coroutines = "1.10.2"
kotlin-datetime = "0.7.1-0.6.x-compat"
kotlin-json = "1.10.0"
kotlin-serialization = "1.10.0"
kotlin-json = "1.11.0"
kotlin-serialization = "1.11.0"
kotlin-serialization-kaml = "0.104.0"
kotlin-version = "2.2.0"
ktor = "3.4.0"
ktor = "3.4.3"
minecraft-astralibs = "3.35.0"
minecraft-brigadier = "1.3.10"
minecraft-bstats = "3.2.1"
minecraft-bungee = "1.21-R0.5-SNAPSHOT"
minecraft-bungee = "26.1-R0.1-SNAPSHOT"
minecraft-datafixerupper = "8.0.16"
minecraft-essentialsx = "2.21.2"
minecraft-fabric-api = "0.139.5+"
minecraft-fabric-yarn = "1.20.1+build.10"
minecraft-fabric-kotlin = "1.13.7+"
minecraft-fabric-loader = "0.18.2"
minecraft-fabric-loom = "1.14.6"
minecraft-kyori = "4.26.1"
minecraft-fabric-loader = "0.19.2"
minecraft-fabric-loom = "1.16.1"
minecraft-kyori = "5.0.1"
minecraft-luckperms = "5.5"
minecraft-mcprotocollib = "1.21.7-SNAPSHOT"
minecraft-mockbukkit = "4.33.2"
minecraft-mojang-version = "1.20.1"
minecraft-neoforgeversion = "21.1.129"
minecraft-mockbukkit = "4.108.0"
minecraft-mojang-version = "1.21.11"
minecraft-neoforged-bus = "8.0.2"
minecraft-packetevents = "2.11.2"
minecraft-neoforgegradle = "7.1.20"
minecraft-neoforgeversion = "21.1.129"
minecraft-packetevents = "2.12.1"
minecraft-papi = "2.12.2"
minecraft-protocollib = "5.3.0"
minecraft-spigot = "1.21.9-R0.1-SNAPSHOT"
minecraft-towny = "0.102.0.0"
minecraft-vault = "1.7.1"
minecraft-velocity = "4.0.0-SNAPSHOT"
minecraft-neoforgegradle = "7.1.20"
minecraft-forgeversion = "47.2.20"
minecraft-brigadier = "1.3.10"
minecraft-datafixerupper = "8.0.16"
joml = "1.10.8"
telegrambots = "9.4.0"
telegrambots = "9.5.0"
tests-junit-bom = "6.0.3"
tests-junit-jupiter-api = "6.0.3"
tests-mockito = "5.22.0"
tests-mockito = "5.23.0"
tests-org-testing = "7.12.0"
tests-turbine = "1.2.1"
jmh-core = "1.37"

[libraries]
cache4k = { module = "io.github.reactivecircus.cache4k:cache4k-jvm", version.ref = "cache4k" }
Expand All @@ -75,6 +75,8 @@ exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "e
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
jda = { module = "net.dv8tion:JDA", version.ref = "jda" }
jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core" }
joml = { module = "org.joml:joml", version.ref = "joml" }
klibs-kdi = { module = "ru.astrainteractive.klibs:kdi-jvm", version.ref = "klibs-kdi" }
klibs-kstorage = { module = "ru.astrainteractive.klibs:kstorage", version.ref = "klibs-kstorage" }
klibs-mikro-core = { module = "ru.astrainteractive.klibs:mikro-core", version.ref = "klibs-mikro" }
Expand Down Expand Up @@ -105,24 +107,26 @@ minecraft-astralibs-core-neoforge = { module = "ru.astrainteractive.astralibs:co
minecraft-astralibs-exposed = { module = "ru.astrainteractive.astralibs:exposed", version.ref = "minecraft-astralibs" }
minecraft-astralibs-menu-bukkit = { module = "ru.astrainteractive.astralibs:menu-bukkit", version.ref = "minecraft-astralibs" }
minecraft-astralibs-orm = { module = "ru.astrainteractive.astralibs:orm", version.ref = "minecraft-astralibs" }
minecraft-brigadier = { module = "com.mojang:brigadier", version.ref = "minecraft-brigadier" }
minecraft-bstats = { module = "org.bstats:bstats-bukkit", version.ref = "minecraft-bstats" }
minecraft-bungee = { module = "net.md-5:bungeecord-api", version.ref = "minecraft-bungee" }
minecraft-datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "minecraft-datafixerupper" }
minecraft-discordsrv = { module = "com.discordsrv:discordsrv", version.ref = "discordsrv" }
minecraft-essentialsx = { module = "net.essentialsx:EssentialsX", version.ref = "minecraft-essentialsx" }
minecraft-fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "minecraft-fabric-api" }
minecraft-fabric-kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "minecraft-fabric-kotlin" }
minecraft-fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "minecraft-fabric-loader" }
minecraft-fabric-mojang = { module = "com.mojang:minecraft", version.ref = "minecraft-mojang-version" }
minecraft-kyori-plain = { module = "net.kyori:adventure-text-serializer-plain", version.ref = "minecraft-kyori" }
minecraft-kyori-api = { module = "net.kyori:adventure-api", version.ref = "minecraft-kyori" }
minecraft-kyori-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "minecraft-kyori" }
minecraft-kyori-legacy = { module = "net.kyori:adventure-text-serializer-legacy", version.ref = "minecraft-kyori" }
minecraft-kyori-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "minecraft-kyori" }
minecraft-kyori-plain = { module = "net.kyori:adventure-text-serializer-plain", version.ref = "minecraft-kyori" }
minecraft-luckperms = { module = "net.luckperms:api", version.ref = "minecraft-luckperms" }
minecraft-mcprotocollib = { module = "org.geysermc.mcprotocollib:protocol", version.ref = "minecraft-mcprotocollib" }
minecraft-mockbukkit = { module = "com.github.MockBukkit:MockBukkit", version.ref = "minecraft-mockbukkit" }
minecraft-neoforgeversion = { module = "net.neoforged:neoforge", version.ref = "minecraft-neoforgeversion" }
minecraft-neoforged-bus = { module = "net.neoforged:bus", version.ref = "minecraft-neoforged-bus" }
minecraft-neoforgeversion = { module = "net.neoforged:neoforge", version.ref = "minecraft-neoforgeversion" }
minecraft-packetevents = { module = "com.github.retrooper:packetevents-spigot", version.ref = "minecraft-packetevents" }
minecraft-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-spigot" }
minecraft-papi = { module = "me.clip:placeholderapi", version.ref = "minecraft-papi" }
Expand All @@ -132,8 +136,6 @@ minecraft-spigot-core = { module = "org.spigotmc:spigot", version.ref = "minecra
minecraft-towny = { module = "com.palmergames.bukkit.towny:towny", version.ref = "minecraft-towny" }
minecraft-vaultapi = { module = "com.github.MilkBowl:VaultAPI", version.ref = "minecraft-vault" }
minecraft-velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "minecraft-velocity" }
minecraft-brigadier = { module = "com.mojang:brigadier", version.ref = "minecraft-brigadier" }
minecraft-datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "minecraft-datafixerupper" }
telegrambots-client = { module = "org.telegram:telegrambots-client", version.ref = "telegrambots" }
telegrambots-extensions = { module = "org.telegram:telegrambots-extensions", version.ref = "telegrambots" }
telegrambots-longpolling = { module = "org.telegram:telegrambots-longpolling", version.ref = "telegrambots" }
Expand All @@ -145,8 +147,7 @@ tests-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }
tests-mockito = { module = "org.mockito:mockito-core", version.ref = "tests-mockito" }
tests-org-testing = { module = "org.testng:testng", version.ref = "tests-org-testing" }
tests-turbine = { module = "app.cash.turbine:turbine", version.ref = "tests-turbine" }
jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core" }
joml = { module = "org.joml:joml", version.ref = "joml" }

[plugins]
gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" }
gradle-fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" }
Expand All @@ -163,13 +164,13 @@ klibs-gradle-java-version = { id = "ru.astrainteractive.gradleplugin.java.versio
klibs-gradle-minecraft-empty = { id = "ru.astrainteractive.gradleplugin.minecraft.empty", version.ref = "klibs-gradleplugin" }
klibs-gradle-minecraft-multiplatform = { id = "ru.astrainteractive.gradleplugin.minecraft.multiplatform", version.ref = "klibs-gradleplugin" }
klibs-gradle-publication = { id = "ru.astrainteractive.gradleplugin.publication", version.ref = "klibs-gradleplugin" }
klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.root.info", version.ref = "klibs-gradleplugin" }
klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.rootinfo", version.ref = "klibs-gradleplugin" }
klibs-gradle-stub-javadoc = { id = "ru.astrainteractive.gradleplugin.stub.javadoc", version.ref = "klibs-gradleplugin" }
klibs-minecraft-resource-processor = { id = "ru.astrainteractive.gradleplugin.minecraft.resource-processor", version.ref = "klibs-gradleplugin" }
klibs-minecraft-resource-processor = { id = "ru.astrainteractive.gradleplugin.minecraft.resource.processor", version.ref = "klibs-gradleplugin" }
klibs-minecraft-shadow = { id = "ru.astrainteractive.gradleplugin.minecraft.shadow", version.ref = "klibs-gradleplugin" }
kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin-version" }
kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlin-benchmark" }
kotlin-gradle = { id = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" }
Loading
Loading