Skip to content

Commit 71b417c

Browse files
committed
Fix more Gradle errors
1 parent d67f62b commit 71b417c

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

bootstrap/build.gradle.kts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import dev.deftu.gradle.utils.GameSide
44
import dev.deftu.gradle.utils.includeOrShade
5+
import dev.deftu.gradle.utils.version.MinecraftDropVersion
56
import dev.deftu.gradle.utils.version.MinecraftReleaseVersion
67
import org.polyfrost.gradle.provideFabricApiDependency
78
import org.polyfrost.gradle.provideIncludedDependencies
@@ -39,9 +40,15 @@ repositories {
3940

4041
dependencies {
4142
if (mcData.version.preprocessorKey >= 11300 || mcData.isFabric) {
42-
val mcVersion = mcData.version as MinecraftReleaseVersion
43+
val mcVersion = mcData.version
44+
val tripleVersion = when (mcVersion) {
45+
is MinecraftDropVersion -> Triple(mcVersion.year, mcVersion.drop, mcVersion.patch)
46+
is MinecraftReleaseVersion -> Triple(mcVersion.major, mcVersion.minor, mcVersion.patch)
47+
else -> error("no")
48+
}
49+
4350
provideIncludedDependencies(
44-
Triple(mcVersion.major, mcVersion.minor, mcVersion.patch),
51+
tripleVersion,
4552
mcData.loader.friendlyString
4653
).forEach {
4754
includeOrShade(compileOnly(it.dep)!!)
@@ -54,9 +61,9 @@ dependencies {
5461
}
5562
includeOrShade(compileOnly(project(":minecraft:$mcData")) { isTransitive = false })
5663
if (mcData.isFabric) {
57-
provideFabricApiDependency(Triple(mcVersion.major, mcVersion.minor, mcVersion.patch)).forEach {
64+
provideFabricApiDependency(tripleVersion).forEach {
5865
@Suppress("USELESS_CAST")
59-
includeOrShade(modCompileOnly(if (it.dep is String) it.dep as String else "${(it.dep as ExternalModuleDependency).group}:${(it.dep as ExternalModuleDependency).name}:${(it.dep as ExternalModuleDependency).version}") {
66+
includeOrShade(maybeModCompileOnly(if (it.dep is String) it.dep as String else "${(it.dep as ExternalModuleDependency).group}:${(it.dep as ExternalModuleDependency).name}:${(it.dep as ExternalModuleDependency).version}") {
6067
isTransitive = false
6168
})
6269
}

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ listOf(
137137
"1.21.8-fabric",
138138
"1.21.10-fabric",
139139
"1.21.11-fabric",
140-
"26.1-fabric"
140+
// "26.1-fabric"
141141
).contains(version)) {
142142
include(bootstrapProj)
143143
project(bootstrapProj).apply {

0 commit comments

Comments
 (0)