From ec33f0c4812af193b6be0fd776d850d28166c293 Mon Sep 17 00:00:00 2001 From: Mark Perry Date: Sun, 20 Sep 2015 09:27:18 +1000 Subject: Implemented most options to use the plugin to compile the Frege source --- src/main/groovy/frege/gradle/FregePlugin.groovy | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/main/groovy/frege/gradle/FregePlugin.groovy') diff --git a/src/main/groovy/frege/gradle/FregePlugin.groovy b/src/main/groovy/frege/gradle/FregePlugin.groovy index 2f9402d..ce5cdd5 100644 --- a/src/main/groovy/frege/gradle/FregePlugin.groovy +++ b/src/main/groovy/frege/gradle/FregePlugin.groovy @@ -1,9 +1,11 @@ package frege.gradle +import groovy.transform.TypeChecked import org.gradle.api.Plugin import org.gradle.api.Project import fj.data.Option +//@TypeChecked class FregePlugin implements Plugin { void apply(Project project) { @@ -16,8 +18,8 @@ class FregePlugin implements Plugin { project.task('compileFrege', type: CompileTask, group: 'Build') << { } - project.tasks.classes.dependsOn("compileFrege") - project.tasks.compileFrege.dependsOn("compileJava") + project.tasks["classes"].dependsOn("compileFrege") + project.tasks["compileFrege"].dependsOn("compileJava") project.task('compileTestFrege', type: CompileTask, group: 'Build') { // sourcePaths = [CompileTask.deduceTestSrcDir(project)] @@ -25,9 +27,9 @@ class FregePlugin implements Plugin { // logger.info("compileTestFrege debug") // logger.info("projectDir ${project.projectDir}") // logger.info("defaultSrc ${CompileTask.DEFAULT_SRC_DIR}") - fregePackageDirs = Option.fromNull( + fregePaths = Option.fromNull( CompileTask.deduceClassesDir(project) - ).map { d -> [d.absolutePath] }.orSome([]) + ).map{d -> [d]}.orSome([]) } project.tasks.testClasses.dependsOn("compileTestFrege") project.tasks.compileTestFrege.dependsOn("compileTestJava") -- cgit