From 5e96eef0db325a98aad62259a27a3a47cd048d34 Mon Sep 17 00:00:00 2001 From: Jesse Brault Date: Sun, 4 Jan 2026 11:50:59 -0600 Subject: [PATCH] Get rid of objectFactory in buildScriptBase. --- .../jessebrault/ssg/buildscript/BuildScriptBase.groovy | 10 ---------- .../ssg/buildscript/DefaultBuildScriptFactory.java | 7 +------ 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy index e1f7006..6da8d1c 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy @@ -26,7 +26,6 @@ abstract class BuildScriptBase extends Script { private Closure buildClosure = { } private File projectRoot private String buildName - private ObjectFactory objectFactory private Map cliArgs /* --- Instance DSL helpers --- */ @@ -76,15 +75,6 @@ abstract class BuildScriptBase extends Script { this.buildClosure } - ObjectFactory getObjectFactory() { - return objectFactory - } - - @ApiStatus.Internal - void setObjectFactory(ObjectFactory objectFactory) { - this.objectFactory = objectFactory - } - Map getCliArgs() { return cliArgs } diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/DefaultBuildScriptFactory.java b/api/src/main/groovy/com/jessebrault/ssg/buildscript/DefaultBuildScriptFactory.java index 88dba81..c2875f8 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/DefaultBuildScriptFactory.java +++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/DefaultBuildScriptFactory.java @@ -1,6 +1,5 @@ package com.jessebrault.ssg.buildscript; -import com.jessebrault.di.ObjectFactory; import groovy.lang.GroovyClassLoader; import jakarta.inject.Inject; import jakarta.inject.Named; @@ -18,19 +17,16 @@ public class DefaultBuildScriptFactory implements BuildScriptFactory { private final GroovyClassLoader groovyClassLoader; private final List scriptBaseUrls; private final File projectDir; - private final ObjectFactory objectFactory; @Inject public DefaultBuildScriptFactory( GroovyClassLoader groovyClassLoader, @Named("scriptBaseUrls") List scriptBaseUrls, - @Named("projectDir") File projectDir, - ObjectFactory objectFactory + @Named("projectDir") File projectDir ) { this.groovyClassLoader = groovyClassLoader; this.scriptBaseUrls = scriptBaseUrls; this.projectDir = projectDir; - this.objectFactory = objectFactory; } protected GroovyClassLoader getScriptClassLoader() { @@ -62,7 +58,6 @@ public class DefaultBuildScriptFactory implements BuildScriptFactory { // configure props script.setProjectRoot(this.projectDir); script.setBuildName(scriptFqn); - script.setObjectFactory(this.objectFactory); script.setCliArgs(scriptCliArgs); // run