DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Bump kommons

Browse Source
This commit is contained in:
DBotThePony 2024-08-27 22:04:24 +07:00
parent d13806d751
commit 434db48dfd
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build.gradle.kts
View File

@ -141,8 +141,14 @@ dependencies {
implementation("thedarkcolour:kotlinforforge:$kotlin_for_forge_version") implementation("thedarkcolour:kotlinforforge:$kotlin_for_forge_version")
jarJar("ru.dbotthepony.kommons:kommons-mc:[$kommons_version,)") { setTransitive(false) } jarJar("ru.dbotthepony.kommons:kommons:[$kommons_version,)") { setTransitive(false) }
implementation("ru.dbotthepony.kommons:kommons-mc:[$kommons_version,)") { setTransitive(false) } implementation("ru.dbotthepony.kommons:kommons:[$kommons_version,)") { setTransitive(false) }
jarJar("ru.dbotthepony.kommons:kommons-gson:[$kommons_version,)") { setTransitive(false) }
implementation("ru.dbotthepony.kommons:kommons-gson:[$kommons_version,)") { setTransitive(false) }
jarJar("ru.dbotthepony.kommons:kommons-guava:[$kommons_version,)") { setTransitive(false) }
implementation("ru.dbotthepony.kommons:kommons-guava:[$kommons_version,)") { setTransitive(false) }
compileOnly("yalter.mousetweaks:MouseTweaks:2.23:api") compileOnly("yalter.mousetweaks:MouseTweaks:2.23:api")
annotationProcessor("org.spongepowered:mixin:${mixin_version}:processor") annotationProcessor("org.spongepowered:mixin:${mixin_version}:processor")
@ -331,6 +337,10 @@ tasks.jarJar.configure {
archiveVersion.set(gitVersion.jarName) archiveVersion.set(gitVersion.jarName)
} }
tasks.assemble.configure {
dependsOn(tasks.jarJar)
}
tasks.withType(ProcessResources::class.java) { tasks.withType(ProcessResources::class.java) {
val replaceProperties = mapOf( val replaceProperties = mapOf(
"mc_version" to mc_version, "mc_version" to mc_version,
@ -348,12 +358,6 @@ tasks {
archiveClassifier.set("sources") archiveClassifier.set("sources")
from(sourceSets.main.get().allSource) from(sourceSets.main.get().allSource)
} }
create("deobfJar", org.gradle.jvm.tasks.Jar::class.java) {
archiveClassifier.set("deobf")
from(sourceSets.main.get().output)
attachManifest()
}
} }
if (project.hasProperty("mavenUser") && project.hasProperty("mavenPassword") && project.hasProperty("mavenUrl")) { if (project.hasProperty("mavenUser") && project.hasProperty("mavenPassword") && project.hasProperty("mavenUrl")) {
@ -367,7 +371,6 @@ if (project.hasProperty("mavenUser") && project.hasProperty("mavenPassword") &&
// from(components["java"]) // from(components["java"])
artifact(tasks["jar"]) artifact(tasks["jar"])
artifact(tasks["sourceJar"]) artifact(tasks["sourceJar"])
artifact(tasks["deobfJar"])
version = gitVersion.publishVersion version = gitVersion.publishVersion

2
gradle.properties
View File

@ -19,7 +19,7 @@ forge_version=21.1.1
mixingradle_version=0.7.33 mixingradle_version=0.7.33
mixin_version=0.8.5 mixin_version=0.8.5
kommons_version=3.1.0 kommons_version=3.1.1
jei_version=19.8.2.99 jei_version=19.8.2.99
jupiter_version=5.9.2 jupiter_version=5.9.2