Skip to content

Commit

Permalink
update to 1.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
MeiNanziiii committed Jan 1, 2025
1 parent ebb714d commit 901fe95
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 26 deletions.
26 changes: 9 additions & 17 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
kotlin("jvm") version "2.0.20"
id("fabric-loom") version "1.8-SNAPSHOT"
id("fabric-loom") version "1.9-SNAPSHOT"
}

loom {
Expand All @@ -25,7 +25,7 @@ repositories {
maven("https://repo.kord.dev/snapshots")
}

val includeImplementation by configurations.creating {
val includeImplementation: Configuration by configurations.creating {
configurations.implementation.configure { extendsFrom(this@creating) }
}

Expand Down Expand Up @@ -88,42 +88,34 @@ tasks {
}
}

/* Thanks to https://github.com/jakobkmar for this script */
/* Thanks to https://github.com/jakobkmar for original script */
fun DependencyHandlerScope.includeTransitive(
dependencies: Set<ResolvedDependency>,
fabricLanguageKotlinDependency: ResolvedDependency,
minecraftDependencies: Set<ResolvedDependency>,
kotlinDependency: ResolvedDependency,
checkedDependencies: MutableSet<ResolvedDependency> = HashSet()
) {
val minecraftDependencies = listOf(
"slf4j-api",
"commons-logging",
"oshi-core",
"jna",
"jna-platform",
"gson",
"commons-lang3"
)

dependencies.forEach {
if (checkedDependencies.contains(it) || it.moduleGroup == "org.jetbrains.kotlin" || it.moduleGroup == "org.jetbrains.kotlinx") return@forEach

if (fabricLanguageKotlinDependency.children.any { kotlinDep -> kotlinDep.name == it.name }) {
if (kotlinDependency.children.any { dep -> dep.name == it.name }) {
println("Skipping -> ${it.name} (already in fabric-language-kotlin)")
} else if (minecraftDependencies.any { dep -> dep == it.moduleName }) {
} else if (minecraftDependencies.any { dep -> dep.moduleGroup == it.moduleGroup && dep.moduleName == it.moduleName }) {
println("Skipping -> ${it.name} (already in minecraft)")
} else {
include(it.name)
println("Including -> ${it.name}")
}
checkedDependencies += it

includeTransitive(it.children, fabricLanguageKotlinDependency, checkedDependencies)
includeTransitive(it.children, minecraftDependencies, kotlinDependency, checkedDependencies)
}
}

fun DependencyHandlerScope.handleIncludes(configuration: Configuration) {
includeTransitive(
configuration.resolvedConfiguration.firstLevelModuleDependencies,
configurations.minecraftLibraries.get().resolvedConfiguration.firstLevelModuleDependencies,
configurations.modImplementation.get().resolvedConfiguration.firstLevelModuleDependencies
.first { it.moduleGroup == "net.fabricmc" && it.moduleName == "fabric-language-kotlin" },
)
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
16 changes: 8 additions & 8 deletions libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[versions]

minecraft="1.20.1"
yarn="1.20.1+build.10"
minecraft="1.21.4"
yarn="1.21.4+build.4"

fabric-loader="0.16.5"
fabric-kotlin="1.12.2+kotlin.2.0.20"
fabric-api="0.92.2+1.20.1"
fabric-loader="0.16.9"
fabric-kotlin="1.13.0+kotlin.2.1.0"
fabric-api="0.114.0+1.21.4"

kordex="2.3.1-SNAPSHOT"
konf="1.1.2"

discord-reserializer="4.3.0"
simple-ast="2.2.8"

kyori="5.9.0"
placeholder-api="2.1.3+1.20.1"
kyori="6.2.0"
placeholder-api="2.5.1+1.21.3"

luckperms="5.4"
permissions="0.2-SNAPSHOT"
permissions="0.3.3"

[libraries]

Expand Down

0 comments on commit 901fe95

Please sign in to comment.