diff options
| author | Rene Groeschke <rene@gradle.com> | 2015-11-22 00:58:41 +0000 |
|---|---|---|
| committer | Rene Groeschke <rene@gradle.com> | 2015-11-22 00:58:41 +0000 |
| commit | 61196dfe58d3fd38f09c3ddfbcc8cb932d240c1e (patch) | |
| tree | 9f6561b11f660941da3dd304b64d5d5a484a7c19 | |
| parent | fdc7b27d69b22e0ffa151d56c8f3812dcd229555 (diff) | |
| download | frege-gradle-plugin-61196dfe58d3fd38f09c3ddfbcc8cb932d240c1e.tar.gz frege-gradle-plugin-61196dfe58d3fd38f09c3ddfbcc8cb932d240c1e.tar.bz2 frege-gradle-plugin-61196dfe58d3fd38f09c3ddfbcc8cb932d240c1e.zip | |
fix fregepath handling
3 files changed, 5 insertions, 5 deletions
diff --git a/src/integTest/groovy/frege/gradle/tasks/FregeCompileIntegTest.groovy b/src/integTest/groovy/frege/gradle/tasks/FregeCompileIntegTest.groovy index 58e21ba..3845e23 100644 --- a/src/integTest/groovy/frege/gradle/tasks/FregeCompileIntegTest.groovy +++ b/src/integTest/groovy/frege/gradle/tasks/FregeCompileIntegTest.groovy @@ -28,7 +28,7 @@ class FregeCompileIntegTest extends AbstractFregeIntegrationSpec { source("frege-src") module = "frege-src" classpath = configurations.frege - fregePath = configurations.frege + fregepath = configurations.frege } """ 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()) { |