Turn lambda in BndManifestPlugin into inner class to fix up-to-date c…

…hecking.
diffplug · Feb 6, 2019 · 6480298 · 6480298
1 parent 49a366d
commit 6480298
Showing 1 changed file with 25 additions and 23 deletions.
diff --git a/src/main/java/com/diffplug/gradle/osgi/BndManifestPlugin.java b/src/main/java/com/diffplug/gradle/osgi/BndManifestPlugin.java
@@ -25,6 +25,7 @@
 import java.util.*;
 import java.util.function.Function;
 
+import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.java.archives.Attributes;
@@ -105,33 +106,34 @@ protected void applyOnce(Project proj) {
 					"copyFromTask must reside within includeTask");
 
 			extension.includeTasks.forEach(name -> {
-
 				Jar jarTask = getAsJar(proj, (String) name);
-
 				// at the end of the jar, modify the manifest
-				jarTask.doLast(unused -> {
-					Errors.rethrow().run(() -> {
-						byte[] manifest = getManifestContent(jarTask, extension).getBytes(StandardCharsets.UTF_8);
-						// modify the jar
-						Map<String, Function<byte[], byte[]>> toModify = ImmutableMap.of("META-INF/MANIFEST.MF", in -> manifest);
-						ZipMisc.modify(jarTask.getArchivePath(), toModify, Predicates.alwaysFalse());
-						// write manifest to the output resources directory
-						Throwing.Consumer<Path> writeManifest = path -> {
-							if (Files.exists(path)) {
-								if (Arrays.equals(Files.readAllBytes(path), manifest)) {
-									return;
+				jarTask.doLast("Set OSGi manifest", new Action<Task>() {
+					@Override
+					public void execute(Task unused) {
+						Errors.rethrow().run(() -> {
+							byte[] manifest = getManifestContent(jarTask, extension).getBytes(StandardCharsets.UTF_8);
+							// modify the jar
+							Map<String, Function<byte[], byte[]>> toModify = ImmutableMap.of("META-INF/MANIFEST.MF", in -> manifest);
+							ZipMisc.modify(jarTask.getArchivePath(), toModify, Predicates.alwaysFalse());
+							// write manifest to the output resources directory
+							Throwing.Consumer<Path> writeManifest = path -> {
+								if (Files.exists(path)) {
+									if (Arrays.equals(Files.readAllBytes(path), manifest)) {
+										return;
+									}
 								}
+								Files.createDirectories(path.getParent());
+								Files.write(path, manifest);
+							};
+							writeManifest.accept(outputManifest(jarTask));
+
+							// and maybe write it to `osgiBndManifest { copyTo }`.
+							if (extension.copyTo != null && jarTask.equals(copyFromTask)) {
+								writeManifest.accept(jarTask.getProject().file(extension.copyTo).toPath());
 							}
-							Files.createDirectories(path.getParent());
-							Files.write(path, manifest);
-						};
-						writeManifest.accept(outputManifest(jarTask));
-
-						// and maybe write it to `osgiBndManifest { copyTo }`.
-						if (extension.copyTo != null && jarTask.equals(copyFromTask)) {
-							writeManifest.accept(jarTask.getProject().file(extension.copyTo).toPath());
-						}
-					});
+						});
+					}
 				});
 			});