From accf9d6d05ca7588f5e8a1bd608343c8e9a8974d Mon Sep 17 00:00:00 2001
From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com>
Date: Tue, 25 Apr 2023 20:46:02 +0200
Subject: [PATCH] Cleaned up OutputDir and OutputDirFunctions.

---
 .../com/jessebrault/ssg/buildscript/OutputDir.groovy      | 8 --------
 .../jessebrault/ssg/buildscript/OutputDirFunctions.groovy | 3 ++-
 .../jessebrault/ssg/buildscript/dsl/BuildDelegate.groovy  | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/OutputDir.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/OutputDir.groovy
index 2f6c99a..20ae5d1 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/OutputDir.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/OutputDir.groovy
@@ -6,10 +6,6 @@ import org.jetbrains.annotations.Nullable
 @EqualsAndHashCode
 final class OutputDir {
 
-    static OutputDir concat(OutputDir od0, OutputDir od1) {
-        new OutputDir(od1.path ? od1.path : od0.path)
-    }
-
     @Nullable
     final String path
 
@@ -25,8 +21,4 @@ final class OutputDir {
         this.path ? new File(this.path) : new File('')
     }
 
-    OutputDir plus(OutputDir other) {
-        concat(this, other)
-    }
-
 }
diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/OutputDirFunctions.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/OutputDirFunctions.groovy
index ace7ef5..01602b6 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/OutputDirFunctions.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/OutputDirFunctions.groovy
@@ -2,6 +2,7 @@ package com.jessebrault.ssg.buildscript
 
 import groovy.transform.stc.ClosureParams
 import groovy.transform.stc.SimpleType
+import org.jetbrains.annotations.Nullable
 
 import java.util.function.Function
 
@@ -27,7 +28,7 @@ final class OutputDirFunctions {
         of { new OutputDir(dir) }
     }
 
-    static Function<Build, OutputDir> of(String path) {
+    static Function<Build, OutputDir> of(@Nullable String path) {
         of { new OutputDir(path) }
     }
 
diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/dsl/BuildDelegate.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/dsl/BuildDelegate.groovy
index 019d8dc..01d010e 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/dsl/BuildDelegate.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/dsl/BuildDelegate.groovy
@@ -28,11 +28,11 @@ final class BuildDelegate extends AbstractBuildDelegate<Build> {
     }
 
     void setOutputDir(File file) {
-        this.outputDirFunction = { new OutputDir(file) }
+        this.outputDirFunction = OutputDirFunctions.of(file)
     }
 
     void setOutputDir(@Nullable String path) {
-        this.outputDirFunction = { new OutputDir(path) }
+        this.outputDirFunction = OutputDirFunctions.of(path)
     }
 
 }