Skip to content

Commit f93c005

Browse files
committed
Remove deprecated API use of ConfigureUtil
Signed-off-by: SizableShrimp <[email protected]>
1 parent ab94aa1 commit f93c005

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/userdev/java/net/minecraftforge/gradle/userdev/manifest/DefaultInheritManifest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
import org.gradle.api.java.archives.ManifestMergeSpec;
1515
import org.gradle.api.java.archives.internal.DefaultManifest;
1616
import org.gradle.api.java.archives.internal.DefaultManifestMergeSpec;
17-
import org.gradle.util.ConfigureUtil;
1817

19-
import java.io.Writer;
2018
import java.util.ArrayList;
2119
import java.util.List;
2220
import java.util.Map;
@@ -38,13 +36,13 @@ public InheritManifest inheritFrom(Object... inheritPaths) {
3836
return this;
3937
}
4038

41-
@SuppressWarnings("deprecation") //That is the only exposed method for now.....
4239
@Override
43-
public InheritManifest inheritFrom(Object inheritPaths, Closure closure) {
40+
public InheritManifest inheritFrom(Object inheritPaths, Action<ManifestMergeSpec> action) {
4441
DefaultManifestMergeSpec mergeSpec = new DefaultManifestMergeSpec();
4542
mergeSpec.from(inheritPaths);
4643
inheritMergeSpecs.add(mergeSpec);
47-
ConfigureUtil.configure(closure, mergeSpec);
44+
if (action != null)
45+
action.execute(mergeSpec);
4846
return this;
4947
}
5048

src/userdev/java/net/minecraftforge/gradle/userdev/manifest/InheritManifest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55

66
package net.minecraftforge.gradle.userdev.manifest;
77

8-
import groovy.lang.Closure;
8+
import org.gradle.api.Action;
99
import org.gradle.api.java.archives.Manifest;
10+
import org.gradle.api.java.archives.ManifestMergeSpec;
1011

1112
public interface InheritManifest extends Manifest {
1213
InheritManifest inheritFrom(Object... inheritPaths);
1314

14-
InheritManifest inheritFrom(Object inheritPaths, Closure closure);
15+
InheritManifest inheritFrom(Object inheritPaths, Action<ManifestMergeSpec> action);
1516
}

0 commit comments

Comments
 (0)