diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-07-20 17:44:04 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-07-20 17:44:04 +0800 |
| commit | 07bc4eab7b23fee28d0036890337c5af97cc3d2f (patch) | |
| tree | 3d3fe446554db0cb665c7d1ced616f7c645360f6 /src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | |
| parent | 3a354be4d757dcb93c8bf96bd74d50888a3f6e2f (diff) | |
| parent | 2259a4efc8f4dad35880b41cb8be59bc5b857f9b (diff) | |
| download | architectury-loom-07bc4eab7b23fee28d0036890337c5af97cc3d2f.tar.gz architectury-loom-07bc4eab7b23fee28d0036890337c5af97cc3d2f.tar.bz2 architectury-loom-07bc4eab7b23fee28d0036890337c5af97cc3d2f.zip | |
Merge branch 'upstream-0.9' into dev/0.9
# Conflicts:
# src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
# src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
# src/main/java/net/fabricmc/loom/task/RemapJarTask.java
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 3cf81dcb..6b7e1f02 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -29,9 +29,9 @@ import org.gradle.api.artifacts.ConfigurationContainer; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginConvention; import org.gradle.api.tasks.SourceSet; -import org.gradle.api.tasks.bundling.AbstractArchiveTask; import org.gradle.api.tasks.compile.JavaCompile; import org.gradle.api.tasks.javadoc.Javadoc; +import org.gradle.jvm.tasks.Jar; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.build.mixin.JavaApInvoker; @@ -190,7 +190,7 @@ public final class CompileConfiguration { if (extension.remapMod) { RemapConfiguration.setupDefaultRemap(project); } else { - AbstractArchiveTask jarTask = (AbstractArchiveTask) project.getTasks().getByName("jar"); + Jar jarTask = (Jar) project.getTasks().getByName("jar"); extension.getUnmappedModCollection().from(jarTask); } |