jessebrault/ssg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Get rid of objectFactory in buildScriptBase.

Browse Source
This commit is contained in:
Jesse Brault 2026-01-04 11:50:59 -06:00
parent ba821b11c2
commit 5e96eef0db
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy
View File

@ -26,7 +26,6 @@ abstract class BuildScriptBase extends Script {
private Closure buildClosure = { } private Closure buildClosure = { }
private File projectRoot private File projectRoot
private String buildName private String buildName
private ObjectFactory objectFactory
private Map<String, String> cliArgs private Map<String, String> cliArgs
/* --- Instance DSL helpers --- */ /* --- Instance DSL helpers --- */
@ -76,15 +75,6 @@ abstract class BuildScriptBase extends Script {
this.buildClosure this.buildClosure
} }
ObjectFactory getObjectFactory() {
return objectFactory
}
@ApiStatus.Internal
void setObjectFactory(ObjectFactory objectFactory) {
this.objectFactory = objectFactory
}
Map<String, String> getCliArgs() { Map<String, String> getCliArgs() {
return cliArgs return cliArgs
} }

7
api/src/main/groovy/com/jessebrault/ssg/buildscript/DefaultBuildScriptFactory.java
View File

@ -1,6 +1,5 @@
package com.jessebrault.ssg.buildscript; package com.jessebrault.ssg.buildscript;
import com.jessebrault.di.ObjectFactory;
import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyClassLoader;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import jakarta.inject.Named; import jakarta.inject.Named;
@ -18,19 +17,16 @@ public class DefaultBuildScriptFactory implements BuildScriptFactory {
private final GroovyClassLoader groovyClassLoader; private final GroovyClassLoader groovyClassLoader;
private final List<URL> scriptBaseUrls; private final List<URL> scriptBaseUrls;
private final File projectDir; private final File projectDir;
private final ObjectFactory objectFactory;
@Inject @Inject
public DefaultBuildScriptFactory( public DefaultBuildScriptFactory(
GroovyClassLoader groovyClassLoader, GroovyClassLoader groovyClassLoader,
@Named("scriptBaseUrls") List<URL> scriptBaseUrls, @Named("scriptBaseUrls") List<URL> scriptBaseUrls,
@Named("projectDir") File projectDir, @Named("projectDir") File projectDir
ObjectFactory objectFactory
) { ) {
this.groovyClassLoader = groovyClassLoader; this.groovyClassLoader = groovyClassLoader;
this.scriptBaseUrls = scriptBaseUrls; this.scriptBaseUrls = scriptBaseUrls;
this.projectDir = projectDir; this.projectDir = projectDir;
this.objectFactory = objectFactory;
} }
protected GroovyClassLoader getScriptClassLoader() { protected GroovyClassLoader getScriptClassLoader() {
@ -62,7 +58,6 @@ public class DefaultBuildScriptFactory implements BuildScriptFactory {
// configure props // configure props
script.setProjectRoot(this.projectDir); script.setProjectRoot(this.projectDir);
script.setBuildName(scriptFqn); script.setBuildName(scriptFqn);
script.setObjectFactory(this.objectFactory);
script.setCliArgs(scriptCliArgs); script.setCliArgs(scriptCliArgs);
// run // run