Specify the mappings dependency only in the root project, and don't shadow every dependency.

This commit is contained in:
Username404-59 2021-04-08 13:23:45 +02:00
parent 3ff24b89eb
commit 184d1f7f8f
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
4 changed files with 10 additions and 11 deletions

View File

@ -15,14 +15,22 @@ architectury {
} }
subprojects { subprojects {
lateinit var MappingsDep: Dependency
apply(plugin = "org.jetbrains.kotlin.jvm") apply(plugin = "org.jetbrains.kotlin.jvm")
apply(plugin = "forgified-fabric-loom") apply(plugin = "forgified-fabric-loom")
apply(plugin = "com.github.johnrengelman.shadow") apply(plugin = "com.github.johnrengelman.shadow")
val shadowC by configurations.creating val shadowC by configurations.creating
tasks.withType(ShadowJar::class) { this.configurations = listOf(shadowC) } tasks.withType(ShadowJar::class) { this.configurations = listOf(shadowC) }
extensions.configure<net.fabricmc.loom.LoomGradleExtension>("loom") {
MappingsDep = officialMojangMappings()
silentMojangMappingsLicense()
mixinConfig("snowygui-mixins.json")
refmapName = "snowygui-common-refmap.json"
}
dependencies { dependencies {
shadowC(kotlin("stdlib-jdk8")) shadowC(kotlin("stdlib-jdk8"))
"minecraft"("com.mojang:minecraft:${rootProject.property("minecraft")}") "minecraft"("com.mojang:minecraft:${rootProject.property("minecraft")}")
"mappings"(MappingsDep)
} }
} }

View File

@ -9,12 +9,5 @@ repositories {
} }
dependencies { dependencies {
compileOnly("org.spongepowered:mixin:0.8-SNAPSHOT") compileOnly("org.spongepowered:mixin:0.8-SNAPSHOT")
mappings(loom.officialMojangMappings())
}
loom {
silentMojangMappingsLicense()
mixinConfig("snowygui-mixins.json")
refmapName = "snowygui-common-refmap.json"
} }

View File

@ -13,7 +13,6 @@ object Groups {
architectury { platformSetupLoomIde(); fabric() } architectury { platformSetupLoomIde(); fabric() }
dependencies { dependencies {
mappings(loom.officialMojangMappings())
modApi("${Groups.Fabric}:fabric-loader:${rootProject.property("fabric_loader_version")}") modApi("${Groups.Fabric}:fabric-loader:${rootProject.property("fabric_loader_version")}")
modApi("${Groups.FabricApi}:fabric-resource-loader-v0:${rootProject.property("fabric_resource_loader_version")}") modApi("${Groups.FabricApi}:fabric-resource-loader-v0:${rootProject.property("fabric_resource_loader_version")}")
include("${Groups.FabricApi}:fabric-resource-loader-v0:${rootProject.property("fabric_resource_loader_version")}") { isTransitive = false } include("${Groups.FabricApi}:fabric-resource-loader-v0:${rootProject.property("fabric_resource_loader_version")}") { isTransitive = false }
@ -23,5 +22,5 @@ dependencies {
implementation(project(path = ":common")) { isTransitive = false } implementation(project(path = ":common")) { isTransitive = false }
add("developmentFabric", project(path = ":common")) { isTransitive = false } add("developmentFabric", project(path = ":common")) { isTransitive = false }
shadowC(project(path = ":common", configuration = "transformProductionFabric")) { isTransitive = false } shadowC(project(path = ":common", configuration = "transformProductionFabric")) { isTransitive = false }
}; loom { silentMojangMappingsLicense() } }

View File

@ -1,8 +1,7 @@
architectury { platformSetupLoomIde(); forge() } architectury { platformSetupLoomIde(); forge() }
dependencies { dependencies {
mappings(loom.officialMojangMappings())
forge("net.minecraftforge:forge:${rootProject.architectury.minecraft}-${rootProject.property("forge_version")}") forge("net.minecraftforge:forge:${rootProject.architectury.minecraft}-${rootProject.property("forge_version")}")
implementation(project(path = ":common")) { isTransitive = false } implementation(project(path = ":common")) { isTransitive = false }
add("developmentForge", project(path = ":common")) { isTransitive = false } add("developmentForge", project(path = ":common")) { isTransitive = false }
shadowC(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false } shadowC(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false }
}; loom { silentMojangMappingsLicense(); useFabricMixin = true } }; loom { useFabricMixin = true }