diff options
Diffstat (limited to 'src/main/groovy/frege/gradle/FregePlugin.groovy')
| -rw-r--r-- | src/main/groovy/frege/gradle/FregePlugin.groovy | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/groovy/frege/gradle/FregePlugin.groovy b/src/main/groovy/frege/gradle/FregePlugin.groovy index 3daf743..33a8b65 100644 --- a/src/main/groovy/frege/gradle/FregePlugin.groovy +++ b/src/main/groovy/frege/gradle/FregePlugin.groovy @@ -15,21 +15,21 @@ class FregePlugin implements Plugin<Project> { project.apply(plugin: 'base') def e = (FregePluginExtension) project.extensions.create("frege", FregePluginExtension) - project.task('compileFrege', type: CompileTask, group: 'Build') << { - + project.task('compileFrege', type: CompileTask, group: 'Build', dependsOn: "compileJava") { + module = CompileTask.deduceSourceDir(project).absolutePath } project.tasks["classes"].dependsOn("compileFrege") - project.tasks["compileFrege"].dependsOn("compileJava") +// project.tasks["compileFrege"].dependsOn("compileJava") project.task('compileTestFrege', type: CompileTask, group: 'Build') { // sourcePaths = [CompileTask.deduceTestSrcDir(project)] + module = CompileTask.deduceTestSrcDir(project).absolutePath outputDir = CompileTask.deduceTestClassesDir(project) // logger.info("compileTestFrege debug") // logger.info("projectDir ${project.projectDir}") // logger.info("defaultSrc ${CompileTask.DEFAULT_SRC_DIR}") - fregePaths = Option.fromNull( - CompileTask.deduceClassesDir(project) - ).map{d -> [d]}.orSome([]) + fregePaths = Option.fromNull(CompileTask.deduceClassesDir(project)) + .map{d -> [d]}.orSome([]) } project.tasks.testClasses.dependsOn("compileTestFrege") project.tasks.compileTestFrege.dependsOn("compileTestJava") @@ -37,10 +37,10 @@ class FregePlugin implements Plugin<Project> { def replTask = project.task('fregeRepl', type: ReplTask, group: 'Tools', dependsOn: 'compileFrege') replTask.outputs.upToDateWhen { false } // always run, regardless of up to date checks - def checkTask = project.task('fregeQuickCheck', type: QuickCheckTask, group: 'Tools', dependsOn: 'compileFrege') + def checkTask = project.task('fregeQuickCheck', type: QuickCheckTask, group: 'Tools', dependsOn: 'testClasses') checkTask.outputs.upToDateWhen { false } // always run, regardless of up to date checks - project.tasks.fregeQuickCheck.dependsOn("testClasses") +// project.tasks.fregeQuickCheck.dependsOn("testClasses") project.tasks.test.dependsOn("fregeQuickCheck") project.task('fregeDoc', type: DocTask, group: 'Tools', dependsOn: 'compileFrege') |