Skip to content

Commit ebf7428

Browse files
makeevrsergmakeevrserg
committed
[REFACTOR] Gradle files
1 parent b9bccfa commit ebf7428

19 files changed

Lines changed: 157 additions & 243 deletions

File tree

‎build.gradle.kts‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,12 @@
1-
buildscript {
2-
dependencies {
3-
classpath("com.hierynomus:sshj:0.40.0")
4-
}
5-
}
6-
71
plugins {
8-
java
9-
`maven-publish`
10-
`java-library`
11-
alias(libs.plugins.kotlin.jvm) apply false
12-
alias(libs.plugins.kotlin.serialization) apply false
132
alias(libs.plugins.gradle.buildconfig) apply false
14-
15-
// klibs - core
3+
alias(libs.plugins.gradle.neoforgegradle) apply false
164
alias(libs.plugins.klibs.gradle.detekt) apply false
175
alias(libs.plugins.klibs.gradle.java.version) apply false
6+
alias(libs.plugins.klibs.gradle.minecraft.platform) apply false
187
alias(libs.plugins.klibs.gradle.publication) apply false
198
alias(libs.plugins.klibs.gradle.rootinfo) apply false
209
alias(libs.plugins.klibs.minecraft.resource.processor) apply false
21-
alias(libs.plugins.gradle.neoforgegradle) apply false
22-
}
23-
24-
apply(plugin = "ru.astrainteractive.gradleplugin.detekt")
25-
apply(plugin = "ru.astrainteractive.gradleplugin.rootinfo")
26-
27-
subprojects.forEach {
28-
it.plugins.withId("org.jetbrains.kotlin.jvm") {
29-
it.apply(plugin = "ru.astrainteractive.gradleplugin.java.version")
30-
}
10+
alias(libs.plugins.kotlin.jvm) apply false
11+
alias(libs.plugins.kotlin.serialization) apply false
3112
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ klibs.java.ktarget=21
1313
# Project
1414
klibs.project.name=SoulKeeper
1515
klibs.project.group=ru.astrainteractive.soulkeeper
16-
klibs.project.version.string=1.8.0
16+
klibs.project.version.string=1.8.1
1717
klibs.project.description=Keep your items after death
1818
klibs.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
1919
klibs.project.url=https://github.com/Astra-Interactive/SoulKeeper

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jda = "6.4.1"
1515
jda-webhook = "0.8.4"
1616
jmh-core = "1.37"
1717
joml = "1.10.8"
18-
klibs-gradleplugin = "2.0.3"
18+
klibs-gradleplugin = "2.1.1"
1919
klibs-kdi = "1.4.8"
2020
klibs-kstorage = "5.0.4"
2121
klibs-mikro = "1.23.0"
@@ -27,8 +27,9 @@ kotlin-serialization = "1.11.0"
2727
kotlin-serialization-kaml = "0.104.0"
2828
kotlin-version = "2.2.0"
2929
ktor = "3.4.3"
30-
minecraft-astralibs = "3.40.2"
30+
minecraft-astralibs = "3.40.4"
3131
minecraft-brigadier = "1.3.10"
32+
minecraft-authlib = "6.0.54"
3233
minecraft-bstats = "3.2.1"
3334
minecraft-bungee = "26.1-R0.1-SNAPSHOT"
3435
minecraft-datafixerupper = "8.0.16"
@@ -111,6 +112,7 @@ minecraft-astralibs-exposed = { module = "ru.astrainteractive.astralibs:exposed"
111112
minecraft-astralibs-menu-bukkit = { module = "ru.astrainteractive.astralibs:menu-bukkit", version.ref = "minecraft-astralibs" }
112113
minecraft-astralibs-orm = { module = "ru.astrainteractive.astralibs:orm", version.ref = "minecraft-astralibs" }
113114
minecraft-brigadier = { module = "com.mojang:brigadier", version.ref = "minecraft-brigadier" }
115+
minecraft-authlib = { module = "com.mojang:authlib", version.ref = "minecraft-authlib" }
114116
minecraft-bstats = { module = "org.bstats:bstats-bukkit", version.ref = "minecraft-bstats" }
115117
minecraft-bungee = { module = "net.md-5:bungeecord-api", version.ref = "minecraft-bungee" }
116118
minecraft-datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "minecraft-datafixerupper" }
@@ -161,6 +163,7 @@ gradle-forgerenamer = { id = "net.minecraftforge.renamer", version.ref = "minecr
161163
gradle-ftp = { id = "ru.astrainteractive.ftpplugin.gradleftp", version.ref = "gradle-ftp" }
162164
gradle-neoforgegradle = { id = "net.neoforged.gradle.userdev", version.ref = "minecraft-neoforgegradle" }
163165
gradle-shadow = { id = "com.gradleup.shadow", version.ref = "gradle-shadow" }
166+
klibs-gradle-minecraft-platform = { id = "ru.astrainteractive.gradleplugin.minecraft.platform", version.ref = "klibs-gradleplugin" }
164167
klibs-gradle-detekt = { id = "ru.astrainteractive.gradleplugin.detekt", version.ref = "klibs-gradleplugin" }
165168
klibs-gradle-detekt-compose = { id = "ru.astrainteractive.gradleplugin.detekt.compose", version.ref = "klibs-gradleplugin" }
166169
klibs-gradle-dokka-root = { id = "ru.astrainteractive.gradleplugin.dokka.root", version.ref = "klibs-gradleplugin" }

‎instances/bukkit/build.gradle.kts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22
import ru.astrainteractive.gradleplugin.property.util.requireProjectInfo
33

44
plugins {
5-
kotlin("jvm")
6-
kotlin("plugin.serialization")
7-
alias(libs.plugins.klibs.minecraft.resource.processor)
5+
id("org.jetbrains.kotlin.jvm")
6+
id("org.jetbrains.kotlin.plugin.serialization")
7+
id("ru.astrainteractive.gradleplugin.detekt")
8+
id("ru.astrainteractive.gradleplugin.java.version")
89
alias(libs.plugins.gradle.shadow)
10+
alias(libs.plugins.klibs.minecraft.resource.processor)
911
}
1012

1113
dependencies {

‎instances/forge/build.gradle.kts‎

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2-
import ru.astrainteractive.gradleplugin.property.model.Developer
3-
import ru.astrainteractive.gradleplugin.property.util.requireJinfo
42
import ru.astrainteractive.gradleplugin.property.util.requireProjectInfo
53

64
plugins {
7-
kotlin("jvm")
8-
kotlin("plugin.serialization")
5+
id("org.jetbrains.kotlin.jvm")
6+
id("org.jetbrains.kotlin.plugin.serialization")
7+
id("ru.astrainteractive.gradleplugin.detekt")
8+
id("ru.astrainteractive.gradleplugin.java.version")
99
alias(libs.plugins.gradle.forgegradle)
1010
alias(libs.plugins.gradle.forgerenamer)
1111
alias(libs.plugins.gradle.shadow)
12+
alias(libs.plugins.klibs.minecraft.resource.processor)
1213
}
1314

1415
repositories {
@@ -43,30 +44,14 @@ dependencies {
4344
shadow(projects.modules.service.forge)
4445
shadow(projects.modules.event.forge)
4546
}
46-
tasks.named<ProcessResources>("processResources") {
47-
filteringCharset = "UTF-8"
48-
duplicatesStrategy = DuplicatesStrategy.WARN
49-
val sourceSets = project.extensions.getByName("sourceSets") as SourceSetContainer
50-
val resDirs = sourceSets
51-
.map(SourceSet::getResources)
52-
.map(SourceDirectorySet::getSrcDirs)
53-
from(resDirs) {
54-
include("META-INF/mods.toml")
55-
expand(
56-
mapOf(
57-
"minecraft_version" to libs.versions.minecraft.forgeversion.get().split("-")[0],
58-
"forge_version" to libs.versions.minecraft.forgeversion.get().split("-")[1],
59-
"mod_id" to requireProjectInfo.name.lowercase(),
60-
"mod_name" to requireProjectInfo.name,
61-
"mod_license" to "mod_license",
62-
"mod_version" to requireProjectInfo.versionString,
63-
"mod_authors" to requireProjectInfo.developersList
64-
.map(Developer::id)
65-
.joinToString(","),
66-
"mod_description" to requireProjectInfo.description
67-
)
47+
48+
minecraftProcessResource {
49+
forge(
50+
customProperties = mapOf(
51+
"minecraft_version" to libs.versions.minecraft.forgeversion.get().split("-")[0],
52+
"forge_version" to libs.versions.minecraft.forgeversion.get().split("-")[1],
6853
)
69-
}
54+
)
7055
}
7156

7257
val shadowJar by tasks.getting(ShadowJar::class) {
@@ -221,7 +206,6 @@ val shadowJar by tasks.getting(ShadowJar::class) {
221206
// Don't relocate on: [bukkit]
222207
add("org.h2")
223208
}
224-
225209
add("org.intellij")
226210
add("org.jetbrains.annotations")
227211
// add("org.jetbrains.exposed") // Don't relocate on: [*]
@@ -239,21 +223,15 @@ val shadowJar by tasks.getting(ShadowJar::class) {
239223
}.forEach { pattern -> relocate(pattern, "${requireProjectInfo.group}.shade.$pattern") }
240224
}
241225

242-
java.toolchain.languageVersion = JavaLanguageVersion.of(requireJinfo.jtarget.majorVersion)
243-
244226
minecraft {
245-
mappings("official", "1.20.1")
227+
mappings("official", libs.versions.minecraft.mojang.version.get())
246228
useDefaultAccessTransformer()
247229
}
248230

249231
dependencies {
250232
compileOnly(minecraft.dependency(libs.minecraft.forgeversion.get()))
251233
}
252234

253-
configurations.runtimeElements {
254-
setExtendsFrom(emptySet())
255-
}
256-
257235
renamer {
258236
mappings.from(minecraft.dependency.toSrgFile)
259237
}

‎instances/neoforge/build.gradle.kts‎

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2-
import ru.astrainteractive.gradleplugin.property.model.Developer
3-
import ru.astrainteractive.gradleplugin.property.util.requireJinfo
42
import ru.astrainteractive.gradleplugin.property.util.requireProjectInfo
53

64
plugins {
7-
kotlin("jvm")
8-
kotlin("plugin.serialization")
5+
id("org.jetbrains.kotlin.jvm")
6+
id("org.jetbrains.kotlin.plugin.serialization")
7+
id("ru.astrainteractive.gradleplugin.detekt")
8+
id("ru.astrainteractive.gradleplugin.java.version")
99
alias(libs.plugins.gradle.neoforgegradle)
10-
alias(libs.plugins.klibs.minecraft.resource.processor)
1110
alias(libs.plugins.gradle.shadow)
11+
alias(libs.plugins.klibs.minecraft.resource.processor)
1212
}
1313

1414
repositories {
@@ -41,35 +41,6 @@ dependencies {
4141
shadow(projects.modules.event.neoforge)
4242
}
4343

44-
tasks.named<ProcessResources>("processResources") {
45-
filteringCharset = "UTF-8"
46-
duplicatesStrategy = DuplicatesStrategy.WARN
47-
val sourceSets = project.extensions.getByName("sourceSets") as SourceSetContainer
48-
val resDirs = sourceSets
49-
.map(SourceSet::getResources)
50-
.map(SourceDirectorySet::getSrcDirs)
51-
from(resDirs) {
52-
include("META-INF/neoforge.mods.toml")
53-
expand(
54-
mapOf(
55-
"minecraft_version" to libs.versions.minecraft.mojang.version.get(),
56-
"minecraft_version_range" to listOf(libs.versions.minecraft.mojang.version.get())
57-
.joinToString(","),
58-
"neo_version" to "neo_version",
59-
"neo_version_range" to "[${libs.versions.minecraft.neoforgeversion.get()},)",
60-
"mod_id" to requireProjectInfo.name.lowercase(),
61-
"mod_name" to requireProjectInfo.name,
62-
"mod_license" to "mod_license",
63-
"mod_version" to requireProjectInfo.versionString,
64-
"mod_authors" to requireProjectInfo.developersList
65-
.map(Developer::id)
66-
.joinToString(","),
67-
"mod_description" to requireProjectInfo.description
68-
)
69-
)
70-
}
71-
}
72-
7344
val shadowJar by tasks.getting(ShadowJar::class) {
7445
mergeServiceFiles()
7546
dependsOn(tasks.named<ProcessResources>("processResources"))
@@ -192,12 +163,6 @@ val shadowJar by tasks.getting(ShadowJar::class) {
192163
).forEach { pattern -> relocate(pattern, "${requireProjectInfo.group}.shade.$pattern") }
193164
}
194165

195-
java.toolchain.languageVersion = JavaLanguageVersion.of(requireJinfo.jtarget.majorVersion)
196-
197166
dependencies {
198167
compileOnly(libs.minecraft.neoforgeversion)
199168
}
200-
201-
configurations.runtimeElements {
202-
setExtendsFrom(emptySet())
203-
}

‎modules/command/build.gradle.kts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
plugins {
2-
kotlin("jvm")
3-
kotlin("plugin.serialization")
2+
id("org.jetbrains.kotlin.jvm")
3+
id("org.jetbrains.kotlin.plugin.serialization")
4+
id("ru.astrainteractive.gradleplugin.detekt")
5+
id("ru.astrainteractive.gradleplugin.java.version")
46
}
57

68
dependencies {
79
compileOnly(libs.kotlin.coroutines.core)
8-
implementation(libs.kotlin.serialization.json)
910

10-
implementation(libs.minecraft.astralibs.core)
11+
implementation(libs.klibs.mikro.core)
12+
implementation(libs.kotlin.serialization.json)
1113
implementation(libs.minecraft.astralibs.command)
12-
14+
implementation(libs.minecraft.astralibs.core)
1315
implementation(libs.minecraft.kyori.api)
14-
15-
implementation(libs.klibs.mikro.core)
1616
implementation(projects.modules.core.api)
1717
implementation(projects.modules.dao)
1818
implementation(projects.modules.service.api)

‎modules/core/api/build.gradle.kts‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
plugins {
2-
kotlin("jvm")
3-
kotlin("plugin.serialization")
2+
id("org.jetbrains.kotlin.jvm")
3+
id("org.jetbrains.kotlin.plugin.serialization")
4+
id("ru.astrainteractive.gradleplugin.detekt")
5+
id("ru.astrainteractive.gradleplugin.java.version")
46
}
57

68
dependencies {
7-
implementation(libs.kotlin.serialization.kaml)
8-
implementation(libs.kotlin.serialization.json)
9-
implementation(libs.kotlin.coroutines.core)
10-
// AstraLibs
11-
implementation(libs.minecraft.astralibs.core)
12-
implementation(libs.klibs.mikro.extensions)
13-
// klibs
9+
api(libs.klibs.kstorage)
10+
1411
implementation(libs.klibs.mikro.core)
1512
implementation(libs.klibs.mikro.core)
16-
implementation(libs.klibs.mikro.extensions)
1713
implementation(libs.klibs.mikro.core)
18-
api(libs.klibs.kstorage)
19-
// Test
14+
implementation(libs.klibs.mikro.extensions)
15+
implementation(libs.klibs.mikro.extensions)
16+
implementation(libs.kotlin.coroutines.core)
17+
implementation(libs.kotlin.serialization.json)
18+
implementation(libs.kotlin.serialization.kaml)
19+
implementation(libs.minecraft.astralibs.core)
20+
2021
testImplementation(libs.tests.kotlin.test)
2122
testImplementation(libs.tests.kotlin.test)
2223
}

‎modules/core/bukkit/build.gradle.kts‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
plugins {
2-
kotlin("jvm")
3-
kotlin("plugin.serialization")
2+
id("org.jetbrains.kotlin.jvm")
3+
id("org.jetbrains.kotlin.plugin.serialization")
4+
id("ru.astrainteractive.gradleplugin.detekt")
5+
id("ru.astrainteractive.gradleplugin.java.version")
46
}
57

68
dependencies {
7-
implementation(libs.kotlin.serialization.json)
8-
// Bukkit
9-
compileOnly(libs.minecraft.paper.api)
9+
api(libs.klibs.kstorage)
10+
1011
compileOnly(libs.minecraft.bstats)
11-
// AstraLibs
12-
implementation(libs.minecraft.astralibs.core)
13-
implementation(libs.minecraft.astralibs.menu.bukkit)
14-
implementation(libs.minecraft.astralibs.core.bukkit)
15-
implementation(libs.klibs.mikro.extensions)
16-
// klibs
12+
compileOnly(libs.minecraft.paper.api)
13+
1714
implementation(libs.klibs.mikro.core)
1815
implementation(libs.klibs.mikro.core)
16+
implementation(libs.klibs.mikro.extensions)
17+
implementation(libs.kotlin.serialization.json)
18+
implementation(libs.minecraft.astralibs.core)
19+
implementation(libs.minecraft.astralibs.core.bukkit)
20+
implementation(libs.minecraft.astralibs.menu.bukkit)
1921
implementation(projects.modules.core.api)
20-
api(libs.klibs.kstorage)
2122
}

‎modules/core/forge/build.gradle.kts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
plugins {
2-
kotlin("jvm")
3-
kotlin("plugin.serialization")
2+
id("org.jetbrains.kotlin.jvm")
3+
id("org.jetbrains.kotlin.plugin.serialization")
4+
id("ru.astrainteractive.gradleplugin.detekt")
5+
id("ru.astrainteractive.gradleplugin.java.version")
46
}
57

68
dependencies {
@@ -28,13 +30,9 @@ dependencies {
2830
)
2931
)
3032
}
33+
compileOnly(libs.joml)
3134
compileOnly(libs.minecraft.brigadier)
32-
compileOnly(libs.minecraft.forgeversion)
3335
compileOnly(libs.minecraft.datafixerupper)
3436
compileOnly(libs.minecraft.forge.bus)
35-
compileOnly(libs.joml)
36-
}
37-
38-
configurations.runtimeElements {
39-
setExtendsFrom(emptySet())
37+
compileOnly(libs.minecraft.forgeversion)
4038
}

0 commit comments

Comments
 (0)