imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-30 05:05:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Mark all Minecraft libraries as non-transitive (#702)

Browse Source 
* Fix #700

* Make all MC libraries non-transitive
This commit is contained in:
Juuxel
2022-08-10 20:45:39 +03:00
committed by GitHub
parent 86f07dad08
commit fdba3b476d
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftLibraryProvider.java
View File

@@ -28,6 +28,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Dependency;
import org.gradle.api.artifacts.ModuleDependency;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.LoomRepositoryPlugin;
@@ -60,6 +62,16 @@ public class MinecraftLibraryProvider {
assert provideClient || provideServer;
}
private void addDependency(String configuration, Object dependency) {
Dependency created = project.getDependencies().add(configuration, dependency);
// The launcher doesn't download transitive deps, so neither will we.
// This will also prevent a LaunchWrapper library dependency from pulling in outdated ASM jars.
if (created instanceof ModuleDependency md) {
md.setTransitive(false);
}
}
public void provide() {
if (provideClient) {
// Modern 1.19 version put the natives on the classpath.
@@ -116,17 +128,17 @@ public class MinecraftLibraryProvider {
if (runtimeOnlyLog4j && name.startsWith("org.apache.logging.log4j")) {
// Make log4j a runtime only dep to force slf4j.
project.getDependencies().add(Constants.Configurations.MINECRAFT_RUNTIME_DEPENDENCIES, name);
addDependency(Constants.Configurations.MINECRAFT_RUNTIME_DEPENDENCIES, name);
continue;
}
if (classpathArmNatives && name.startsWith("org.lwjgl:")
&& (name.endsWith("natives-windows") || name.endsWith("natives-linux"))) {
// Add windows and Linux arm64 natives for modern classpath native MC versions.
project.getDependencies().add(Constants.Configurations.MINECRAFT_DEPENDENCIES, name + "-arm64");
addDependency(Constants.Configurations.MINECRAFT_DEPENDENCIES, name + "-arm64");
}
project.getDependencies().add(Constants.Configurations.MINECRAFT_DEPENDENCIES, name);
addDependency(Constants.Configurations.MINECRAFT_DEPENDENCIES, name);
}
if (library.hasNativesForOS()) {
@@ -140,11 +152,11 @@ public class MinecraftLibraryProvider {
for (BundleMetadata.Entry library : serverBundleMetadata.libraries()) {
if (runtimeOnlyLog4j && library.name().startsWith("org.apache.logging.log4j")) {
// Make log4j a runtime only dep to force slf4j.
project.getDependencies().add(Constants.Configurations.MINECRAFT_RUNTIME_DEPENDENCIES, library.name());
addDependency(Constants.Configurations.MINECRAFT_RUNTIME_DEPENDENCIES, library.name());
continue;
}
project.getDependencies().add(Constants.Configurations.MINECRAFT_SERVER_DEPENDENCIES, library.name());
addDependency(Constants.Configurations.MINECRAFT_SERVER_DEPENDENCIES, library.name());
}
}
}
@@ -177,6 +189,6 @@ public class MinecraftLibraryProvider {
}
project.getLogger().debug("Add native dependency '{}'", dependencyNotation);
project.getDependencies().add(Constants.Configurations.MINECRAFT_NATIVES, dependencyNotation);
addDependency(Constants.Configurations.MINECRAFT_NATIVES, dependencyNotation);
}
}