compiles and runs with frege-3.25.84.jar and Gradle 5.0

2 files changed, 9 insertions, 3 deletions

diff --git a/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java b/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
index f45dae4..59fe46e 100644
--- a/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
+++ b/src/main/groovy/frege/gradle/plugins/FregeBasePlugin.java
@@ -15,8 +15,10 @@ import org.gradle.api.plugins.JavaBasePlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.specs.Spec;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.internal.classpath.DefaultClassPath;
 
 import javax.inject.Inject;
+import java.io.File;
 import java.util.concurrent.Callable;
 
 public class FregeBasePlugin implements Plugin<Project> {
@@ -63,16 +65,20 @@ public class FregeBasePlugin implements Plugin<Project> {
                 String compileTaskName = sourceSet.getCompileTaskName("frege");
                 FregeCompile compile = project.getTasks().create(compileTaskName, FregeCompile.class);
                 compile.setModule(project.file(defaultSourcePath).getAbsolutePath());
-                javaBasePlugin.configureForSourceSet(sourceSet, compile);
+//                javaBasePlugin.configureForSourceSet(sourceSet, compile);
                 compile.getConventionMapping().map("fregepath", new Callable() {
                     public Object call() throws Exception {
                         return sourceSet.getCompileClasspath();
                     }
                 });
-
                 compile.dependsOn(sourceSet.getCompileJavaTaskName());
                 compile.setDescription(String.format("Compiles the %s Frege source.", sourceSet.getName()));
                 compile.setSource(fregeSourceSet.getFrege());
+
+//                compile.setClasspath(sourceSet.getCompileClasspath());
+//                compile.setDestinationDir((File)null);
+
+
                 project.getTasks().getByName(sourceSet.getClassesTaskName()).dependsOn(compileTaskName);
                 sourceSet.compiledBy(compile);
             }
diff --git a/src/main/groovy/frege/gradle/plugins/FregePlugin.groovy b/src/main/groovy/frege/gradle/plugins/FregePlugin.groovy
index b2ca074..3dd7ccc 100644
--- a/src/main/groovy/frege/gradle/plugins/FregePlugin.groovy
+++ b/src/main/groovy/frege/gradle/plugins/FregePlugin.groovy
@@ -37,7 +37,7 @@ class FregePlugin implements Plugin<Project> {
         fregeDoc.group = 'frege'
         fregeDoc.dependsOn "compileFrege" // TODO remove
         SourceSet mainSourceSet = project.sourceSets.main
-        fregeDoc.module = mainSourceSet.output.classesDir.absolutePath
+        fregeDoc.module = mainSourceSet.output.classesDirs.first().absolutePath
         fregeDoc.classpath = mainSourceSet.runtimeClasspath
     }