diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-09-11 04:24:40 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-09-11 04:24:40 +0800 |
| commit | d06081d560f3f75e7a9e558828a2ff72cdcde6d2 (patch) | |
| tree | 7b7fd1756b179b0aba091713ee6154646e2d8e68 /src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java | |
| parent | 3bc5ab25c0e1bcd9a7476ca9f988c8c2b86c253b (diff) | |
| parent | 2c464cdef372e92ea719eec618ae713d54cede89 (diff) | |
| download | architectury-loom-d06081d560f3f75e7a9e558828a2ff72cdcde6d2.tar.gz architectury-loom-d06081d560f3f75e7a9e558828a2ff72cdcde6d2.tar.bz2 architectury-loom-d06081d560f3f75e7a9e558828a2ff72cdcde6d2.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/future
# Conflicts:
# build.gradle
# src/main/java/net/fabricmc/loom/LoomGradleExtension.java
# src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
# src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
# src/main/java/net/fabricmc/loom/build/MixinRefmapHelper.java
# src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
# src/main/java/net/fabricmc/loom/configuration/MavenPublication.java
# src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
# src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java
# src/main/java/net/fabricmc/loom/extension/MixinExtensionImpl.java
# src/main/java/net/fabricmc/loom/task/RemapJarTask.java
# src/main/java/net/fabricmc/loom/util/Constants.java
# src/main/java/net/fabricmc/loom/util/SourceRemapper.java
# src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java index 408081d7..edfa2ca6 100644 --- a/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/JarManifestConfiguration.java @@ -30,6 +30,7 @@ import java.util.jar.Manifest; import dev.architectury.tinyremapper.TinyRemapper; import org.gradle.api.Project; +import org.gradle.api.artifacts.Dependency; import org.gradle.util.GradleVersion; import net.fabricmc.loom.LoomGradleExtension; @@ -46,7 +47,7 @@ public final record JarManifestConfiguration(Project project) { LoomGradleExtension extension = LoomGradleExtension.get(project); Attributes attributes = manifest.getMainAttributes(); - var tinyRemapperVersion = Optional.ofNullable(TinyRemapper.class.getPackage().getImplementationVersion()); + Optional<String> tinyRemapperVersion = Optional.ofNullable(TinyRemapper.class.getPackage().getImplementationVersion()); attributes.putValue("Fabric-Gradle-Version", GradleVersion.current().getVersion()); attributes.putValue("Fabric-Loom-Version", LoomGradlePlugin.LOOM_VERSION); @@ -63,7 +64,7 @@ public final record JarManifestConfiguration(Project project) { private void addMixinVersion(Attributes attributes) { // Not super ideal that this uses the mod compile classpath, should prob look into making this not a thing at somepoint - var dependency = project.getConfigurations().getByName(Constants.Configurations.LOADER_DEPENDENCIES) + Optional<Dependency> dependency = project.getConfigurations().getByName(Constants.Configurations.LOADER_DEPENDENCIES) .getDependencies() .stream() .filter(dep -> "sponge-mixin".equals(dep.getName())) |