From 61196dfe58d3fd38f09c3ddfbcc8cb932d240c1e Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@gradle.com>
Date: Sun, 22 Nov 2015 00:58:41 +0000
Subject: fix fregepath handling

---
 src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java | 2 +-
 src/main/groovy/frege/gradle/tasks/FregeCompile.groovy    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/groovy/frege/gradle')

diff --git a/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java b/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
index 7ced11b..a2ebc25 100644
--- a/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
+++ b/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
@@ -61,7 +61,7 @@ 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() {
+                compile.getConventionMapping().map("fregepath", new Callable() {
                     public Object call() throws Exception {
                         return sourceSet.getCompileClasspath();
                     }
diff --git a/src/main/groovy/frege/gradle/tasks/FregeCompile.groovy b/src/main/groovy/frege/gradle/tasks/FregeCompile.groovy
index 8c63df6..290f750 100644
--- a/src/main/groovy/frege/gradle/tasks/FregeCompile.groovy
+++ b/src/main/groovy/frege/gradle/tasks/FregeCompile.groovy
@@ -57,7 +57,7 @@ class FregeCompile extends AbstractCompile {
     String module = ""
 
     @Optional @InputFiles
-    FileCollection fregePath
+    FileCollection fregepath
 
     @Input
     String mainClass = "frege.compiler.Main"
@@ -138,9 +138,9 @@ class FregeCompile extends AbstractCompile {
             args << "-v"
 
 
-        if (fregePath != null && !fregePath.isEmpty()) {
+        if (fregepath != null && !fregepath.isEmpty()) {
             args << "-fp"
-            args << fregePath.files.collect { f -> f.absolutePath }.join(File.pathSeparator)
+            args << fregepath.files.collect { f -> f.absolutePath }.join(File.pathSeparator)
         }
 
         if (sourcePaths != null && !sourcePaths.isEmpty()) {
-- 
cgit