Refactors `SetupFregeCompilerTask` tests

1 files changed, 4 insertions, 11 deletions

diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java b/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java
index 5e8834d..8a6d175 100644
--- a/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/FregeExtension.java
@@ -2,32 +2,25 @@ package ch.fhnw.thga.gradleplugins;
 
 import javax.inject.Inject;
 
+import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.ProjectLayout;
-import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
-import org.gradle.api.provider.Provider;
 
-import groovy.transform.Internal;
 
 public abstract class FregeExtension {
     public static final String DEFAULT_FREGE_EXTENSION_NAMESPACE = "frege";
     public static final String FREGE_VERSION_BUILD_FILE_KEY = "fregeVersion";
     public static final String FREGE_RELEASE_BUILD_FILE_KEY = "fregeRelease";
-    public static final String FREGE_COMPILER_BUILD_FILE_KEY = "fregeCompilerPath";
+    public static final String FREGE_COMPILER_OUTPUT_DIRECTORY_KEY = "fregeCompilerOutputDirectory";
 
     public abstract Property<String> getFregeVersion();
 
     public abstract Property<String> getFregeRelease();
 
-    public abstract RegularFileProperty getFregeCompilerPath();
-
-    @Internal
-    public Provider<String> getDefaultJarName() {
-        return getFregeVersion().map(version -> version + ".jar");
-    }
+    public abstract DirectoryProperty getFregeCompilerOutputDirectory();
 
     @Inject
     public FregeExtension(ProjectLayout projectLayout) {
-        getFregeCompilerPath().set(projectLayout.getProjectDirectory().file("lib/frege" + getDefaultJarName()));
+        getFregeCompilerOutputDirectory().convention(projectLayout.getProjectDirectory().dir("lib"));
     }
 }