From aa50c7a81f10110cf1b8c62a8b346e458561234f Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Tue, 8 Mar 2022 15:34:34 +0100
Subject: [PATCH] 0.2.13
- try to get configurations to work
---
.../testing/plugin/RagConnectTest.java | 14 +++++++---
.../testing/plugin/RelastTest.java | 27 +++++++++++++------
2 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java
index d3fc464..b6caf3f 100644
--- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java
+++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java
@@ -1,6 +1,7 @@
package org.jastadd.preprocessor.testing.plugin;
import groovy.lang.Closure;
+import org.gradle.api.Action;
import org.gradle.api.Project;
import org.gradle.api.file.FileCollection;
import org.gradle.api.plugins.JavaPlugin;
@@ -30,11 +31,16 @@ public abstract class RagConnectTest extends RelastTest {
RagConnectTest.ragconnectCompilerLocation = ragconnectCompilerLocation;
}
+// @SuppressWarnings("unused")
+// public void ragconnect(Closure<?> c) {
+// c.setResolveStrategy(DELEGATE_FIRST);
+// c.setDelegate(getRagconnect());
+// c.call();
+// }
+
@SuppressWarnings("unused")
- public void ragconnect(Closure<?> c) {
- c.setResolveStrategy(DELEGATE_FIRST);
- c.setDelegate(getRagconnect());
- c.call();
+ public void ragconnect(Action<? super RagConnectConfiguration> action) {
+ action.execute(getRagconnect());
}
@OutputFiles
diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
index 1969ba4..81d380c 100644
--- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
+++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
@@ -1,6 +1,7 @@
package org.jastadd.preprocessor.testing.plugin;
import groovy.lang.Closure;
+import org.gradle.api.Action;
import org.gradle.api.DefaultTask;
import org.gradle.api.Project;
import org.gradle.api.file.FileCollection;
@@ -46,18 +47,28 @@ public abstract class RelastTest extends DefaultTask {
return Paths.get(getProject().getProjectDir().getAbsolutePath(), filename);
}
+// @SuppressWarnings("unused")
+// public void relast(Closure<?> c) {
+// c.setResolveStrategy(DELEGATE_FIRST);
+// c.setDelegate(getRelast());
+// c.call();
+// }
+
@SuppressWarnings("unused")
- public void relast(Closure<?> c) {
- c.setResolveStrategy(DELEGATE_FIRST);
- c.setDelegate(getRelast());
- c.call();
+ public void relast(Action<? super RelastConfiguration> action) {
+ action.execute(getRelast());
}
+// @SuppressWarnings("unused")
+// public void jastadd(Closure<?> c) {
+// c.setResolveStrategy(DELEGATE_FIRST);
+// c.setDelegate(getJastadd());
+// c.call();
+// }
+
@SuppressWarnings("unused")
- public void jastadd(Closure<?> c) {
- c.setResolveStrategy(DELEGATE_FIRST);
- c.setDelegate(getJastadd());
- c.call();
+ public void jastadd(Action<? super JastAddConfiguration> action) {
+ action.execute(getJastadd());
}
@TaskAction
--
GitLab