Fix merge conflicts

Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2021-07-20 23:44:11 +08:00
parent cea80b0119
commit 695863367f
25 changed files with 364 additions and 45 deletions

View File

@@ -356,7 +356,7 @@ public class RemapJarTask extends Jar {
}
private NestedJarProvider getNestedJarProvider() {
if (!getProject().getExtensions().getByType(LoomGradleExtension.class).supportsInclude()) {
if (!LoomGradleExtension.get(getProject()).supportsInclude()) {
return EmptyNestedJarProvider.INSTANCE;
}