File tree Expand file tree Collapse file tree 2 files changed +6
-7
lines changed
src/userdev/java/net/minecraftforge/gradle/userdev/manifest Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Original file line number Diff line number Diff line change 1414import org .gradle .api .java .archives .ManifestMergeSpec ;
1515import org .gradle .api .java .archives .internal .DefaultManifest ;
1616import org .gradle .api .java .archives .internal .DefaultManifestMergeSpec ;
17- import org .gradle .util .ConfigureUtil ;
1817
19- import java .io .Writer ;
2018import java .util .ArrayList ;
2119import java .util .List ;
2220import 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
Original file line number Diff line number Diff line change 55
66package net .minecraftforge .gradle .userdev .manifest ;
77
8- import groovy . lang . Closure ;
8+ import org . gradle . api . Action ;
99import org .gradle .api .java .archives .Manifest ;
10+ import org .gradle .api .java .archives .ManifestMergeSpec ;
1011
1112public 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}
You can’t perform that action at this time.
0 commit comments