From fdc7b27d69b22e0ffa151d56c8f3812dcd229555 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@gradle.com>
Date: Sun, 22 Nov 2015 00:50:45 +0000
Subject: some more work on coverage and some cleanup

- get packages for integ tests right
- introduce common AbstractFregeIntegrationSpec
- first stab of unit test coverage for FregeCompile
- minor cleanup on FregeCompile
- configure fregePath as part as part of base plugin convention
---
 src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java')

diff --git a/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java b/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
index 9f8ebd9..7ced11b 100644
--- a/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
+++ b/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
@@ -15,6 +15,7 @@ import org.gradle.api.specs.Spec;
 import org.gradle.api.tasks.SourceSet;
 
 import javax.inject.Inject;
+import java.util.concurrent.Callable;
 
 public class FregeBasePlugin implements Plugin<Project> {
     private FileResolver fileResolver;
@@ -42,7 +43,7 @@ public class FregeBasePlugin implements Plugin<Project> {
 
     private void configureSourceSetDefaults(final JavaBasePlugin javaBasePlugin) {
         project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().all(new Action<SourceSet>() {
-            public void execute(SourceSet sourceSet) {
+            public void execute(final SourceSet sourceSet) {
                 final DefaultFregeSourceSet fregeSourceSet = new DefaultFregeSourceSet(((DefaultSourceSet) sourceSet).getDisplayName(), fileResolver);
                 new DslObject(sourceSet).getConvention().getPlugins().put("frege", fregeSourceSet);
 
@@ -60,6 +61,12 @@ public class FregeBasePlugin implements Plugin<Project> {
                 FregeCompile compile = project.getTasks().create(compileTaskName, FregeCompile.class);
                 compile.setModule(project.file(defaultSourcePath).getAbsolutePath());
                 javaBasePlugin.configureForSourceSet(sourceSet, compile);
+                compile.getConventionMapping().map("classpath", new Callable() {
+                    public Object call() throws Exception {
+                        return sourceSet.getCompileClasspath();
+                    }
+                });
+
                 compile.dependsOn(sourceSet.getCompileJavaTaskName());
                 compile.setDescription(String.format("Compiles the %s Frege source.", sourceSet.getName()));
                 compile.setSource(fregeSourceSet.getFrege());
-- 
cgit