Update dependencies (#1089)

* Update depedencies

* Fix Gradle 9 deprecation warning

* No need for the shadow jar plugin
This commit is contained in:
modmuss
2024-04-15 15:12:49 +01:00
committed by GitHub
parent befebfba9e
commit b8da4e5498
11 changed files with 47 additions and 34 deletions

View File

@@ -34,6 +34,8 @@ import org.gradle.api.artifacts.Dependency;
import org.gradle.api.artifacts.DependencySet;
import org.gradle.api.artifacts.FileCollectionDependency;
import org.gradle.api.artifacts.ResolvedDependency;
import org.gradle.api.artifacts.component.ComponentIdentifier;
import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.util.gradle.SelfResolvingDependencyUtils;
@@ -104,8 +106,21 @@ public class DependencyInfo {
return sourceConfiguration;
}
private boolean matches(ComponentIdentifier identifier) {
if (identifier instanceof ModuleComponentIdentifier moduleComponentIdentifier) {
return moduleComponentIdentifier.getGroup().equals(dependency.getGroup())
&& moduleComponentIdentifier.getModule().equals(dependency.getName())
&& moduleComponentIdentifier.getVersion().equals(dependency.getVersion());
}
return false;
}
public Set<File> resolve() {
return sourceConfiguration.files(dependency);
return sourceConfiguration.getIncoming()
.artifactView(view -> view.componentFilter(this::matches))
.getFiles()
.getFiles();
}
public Optional<File> resolveFile() {

View File

@@ -1,6 +1,5 @@
plugins {
id 'fabric-loom'
id 'com.github.johnrengelman.shadow' version '7.0.0'
id 'maven-publish'
}
@@ -83,9 +82,8 @@ loom {
}
}
shadowJar {
task shadowJar(type: Jar) {
archiveClassifier.set("universal-dev")
configurations = []
from(sourceSets["main"].output)
from(sourceSets["mixin"].output)