the repl needs to start with the targetDir on the classpath where the compiled classes are available for loading

3 files changed, 5 insertions, 22 deletions

diff --git a/src/main/groovy/frege/gradle/FregePlugin.groovy b/src/main/groovy/frege/gradle/FregePlugin.groovy
index 259bffa..2765a21 100644
--- a/src/main/groovy/frege/gradle/FregePlugin.groovy
+++ b/src/main/groovy/frege/gradle/FregePlugin.groovy
@@ -20,9 +20,6 @@ class FregePlugin implements Plugin<Project> {
         def checkTask = project.task('quickCheck', type: FregeQuickCheckTask, group: 'Tools', dependsOn: 'classes')
         checkTask.outputs.upToDateWhen { false } // always run, regardless of up to date checks
 
-
-//        project.task('fregeRepl', type: ReplTask) // we can now choose
-
         project.task('fregeNativeGen', type: NativeGenTask)
 
     }
diff --git a/src/main/groovy/frege/gradle/FregeReplTask.groovy b/src/main/groovy/frege/gradle/FregeReplTask.groovy
index 50d8026..012405b 100644
--- a/src/main/groovy/frege/gradle/FregeReplTask.groovy
+++ b/src/main/groovy/frege/gradle/FregeReplTask.groovy
@@ -6,15 +6,17 @@ import org.gradle.api.tasks.*
 import org.gradle.process.internal.DefaultJavaExecAction
 import org.gradle.process.internal.JavaExecAction
 
-import javax.management.relation.Relation
-
 class FregeReplTask extends DefaultTask {
 
     static String DEFAULT_SRC_DIR        = "src/main/frege"     // TODO: should this come from a source set?
+    static String DEFAULT_CLASSES_SUBDIR = "classes/main"       // TODO: should this come from a convention?
 
     @Optional @InputDirectory
     File sourceDir = new File(project.projectDir, DEFAULT_SRC_DIR)
 
+    @Optional @InputDirectory
+    File targetDir = new File(project.buildDir, DEFAULT_CLASSES_SUBDIR)
+
     @TaskAction
     void openFregeRepl() {
 
@@ -29,7 +31,7 @@ class FregeReplTask extends DefaultTask {
         action.setMain("frege.repl.FregeRepl")
         action.workingDir = sourceDir
         action.standardInput = System.in
-        action.setClasspath(project.files(project.configurations.compile ))
+        action.setClasspath(project.files(project.configurations.runtime ) + project.files(targetDir.absolutePath))
 
         action.execute()
     }
diff --git a/src/main/groovy/frege/gradle/ReplTask.groovy b/src/main/groovy/frege/gradle/ReplTask.groovy
deleted file mode 100644
index eb47944..0000000
--- a/src/main/groovy/frege/gradle/ReplTask.groovy
+++ /dev/null
@@ -1,16 +0,0 @@
-package frege.gradle
-
-import frege.repl.*
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.TaskAction
-
-/**
- * Created by MarkPerry on 17/02/2015.
- */
-public class ReplTask extends DefaultTask {
-
-    @TaskAction
-    void repl() {
-        frege.repl.FregeRepl.main([] as String[])
-    }
-}