From 6ef7fb011725dbfd209bed4969fec552a00b6b1d Mon Sep 17 00:00:00 2001 From: Jesse Brault Date: Mon, 30 Jun 2025 07:38:25 -0500 Subject: [PATCH] Switch to new com.jessebrault.di/fp. --- api/build.gradle | 4 ++-- .../ssg/DefaultStaticSiteGenerator.groovy | 10 +++++----- .../jessebrault/ssg/buildscript/BuildSpec.groovy | 4 ++-- .../ssg/buildscript/delegates/BuildDelegate.groovy | 14 +++++++------- .../com/jessebrault/ssg/di/GlobalsExtension.groovy | 10 +++++----- .../ssg/di/InjectModelQualifierHandler.groovy | 6 +++--- .../ssg/di/InjectModelsQualifierHandler.groovy | 6 +++--- .../ssg/di/InjectPageQualifierHandler.groovy | 6 +++--- .../ssg/di/InjectPagesQualifierHandler.groovy | 6 +++--- .../ssg/di/InjectTextQualifierHandler.groovy | 6 +++--- .../ssg/di/InjectTextsQualifierHandler.groovy | 6 +++--- .../com/jessebrault/ssg/di/ModelsExtension.groovy | 6 +++--- .../com/jessebrault/ssg/di/PagesExtension.groovy | 6 +++--- .../jessebrault/ssg/di/SelfPageExtension.groovy | 2 +- .../ssg/di/SsgNamedRegistryExtension.java | 2 +- .../jessebrault/ssg/di/SsgObjectFactoryUtil.groovy | 4 ++-- .../com/jessebrault/ssg/di/TextsExtension.groovy | 6 +++--- .../groovy/com/jessebrault/ssg/model/Models.groovy | 4 ++-- .../com/jessebrault/ssg/model/ProviderModel.groovy | 2 +- .../com/jessebrault/ssg/page/DefaultWvcPage.groovy | 4 ++-- .../groovy/com/jessebrault/ssg/page/Page.groovy | 2 +- .../com/jessebrault/ssg/util/ObjectUtil.groovy | 4 ++-- .../com/jessebrault/ssg/view/WvcCompiler.groovy | 2 +- buildSrc/src/main/groovy/ssg-common.gradle | 5 +++++ gradle/libs.versions.toml | 4 ++++ 25 files changed, 70 insertions(+), 61 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index a6bbe91..480a342 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -23,8 +23,8 @@ dependencies { api libs.groowt.v api libs.groowt.vc api libs.groowt.wvc - api libs.groowt.fp - api libs.groowt.di + api libs.di + api libs.fp compileOnlyApi libs.jetbrains.anontations diff --git a/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy b/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy index 3b9d9d3..dea47a3 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy @@ -16,9 +16,9 @@ import com.jessebrault.ssg.view.SkipTemplate import com.jessebrault.ssg.view.WvcCompiler import com.jessebrault.ssg.view.WvcPageView import groovy.transform.TupleConstructor -import groowt.util.di.ObjectFactory -import groowt.util.di.RegistryObjectFactory -import groowt.util.fp.option.Option +import com.jessebrault.di.ObjectFactory +import com.jessebrault.di.RegistryObjectFactory +import com.jessebrault.fp.option.Option import groowt.view.component.compiler.SimpleComponentTemplateClassFactory import groowt.view.component.factory.ComponentFactories import groowt.view.component.web.DefaultWebViewComponentContext @@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory import java.nio.file.Files import java.nio.file.Path -import static groowt.util.di.BindingUtil.named -import static groowt.util.di.BindingUtil.toSingleton +import static com.jessebrault.di.BindingUtil.named +import static com.jessebrault.di.BindingUtil.toSingleton @TupleConstructor(includeFields = true, defaults = false) class DefaultStaticSiteGenerator implements StaticSiteGenerator { diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildSpec.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildSpec.groovy index 1d93ee0..da24d9d 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildSpec.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildSpec.groovy @@ -4,8 +4,8 @@ import com.jessebrault.ssg.model.Model import com.jessebrault.ssg.text.TextConverter import groovy.transform.EqualsAndHashCode import groovy.transform.NullCheck -import groowt.util.di.RegistryObjectFactory -import groowt.util.fp.provider.Provider +import com.jessebrault.di.RegistryObjectFactory +import com.jessebrault.fp.provider.Provider import static com.jessebrault.ssg.util.ObjectUtil.requireProvider import static com.jessebrault.ssg.util.ObjectUtil.requireString diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/delegates/BuildDelegate.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/delegates/BuildDelegate.groovy index 22df7cd..7cd76f6 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/delegates/BuildDelegate.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/delegates/BuildDelegate.groovy @@ -5,13 +5,13 @@ import com.jessebrault.ssg.model.Models import com.jessebrault.ssg.text.MarkdownTextConverter import com.jessebrault.ssg.text.TextConverter import com.jessebrault.ssg.util.PathUtil -import groowt.util.di.DefaultRegistryObjectFactory -import groowt.util.di.RegistryObjectFactory -import groowt.util.fp.property.DefaultProperty -import groowt.util.fp.property.Property -import groowt.util.fp.provider.DefaultProvider -import groowt.util.fp.provider.NamedProvider -import groowt.util.fp.provider.Provider +import com.jessebrault.di.DefaultRegistryObjectFactory +import com.jessebrault.di.RegistryObjectFactory +import com.jessebrault.fp.property.DefaultProperty +import com.jessebrault.fp.property.Property +import com.jessebrault.fp.provider.DefaultProvider +import com.jessebrault.fp.provider.NamedProvider +import com.jessebrault.fp.provider.Provider import java.nio.file.Path import java.util.function.Supplier diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/GlobalsExtension.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/GlobalsExtension.groovy index 46e581d..4ed471c 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/GlobalsExtension.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/GlobalsExtension.groovy @@ -1,11 +1,11 @@ package com.jessebrault.ssg.di import groovy.transform.TupleConstructor -import groowt.util.di.Binding -import groowt.util.di.QualifierHandler -import groowt.util.di.QualifierHandlerContainer -import groowt.util.di.RegistryExtension -import groowt.util.di.SingletonBinding +import com.jessebrault.di.Binding +import com.jessebrault.di.QualifierHandler +import com.jessebrault.di.QualifierHandlerContainer +import com.jessebrault.di.RegistryExtension +import com.jessebrault.di.SingletonBinding import java.lang.annotation.Annotation diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelQualifierHandler.groovy index 9f8c5bb..b7d9de4 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelQualifierHandler.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelQualifierHandler.groovy @@ -1,9 +1,9 @@ package com.jessebrault.ssg.di import groovy.transform.TupleConstructor -import groowt.util.di.Binding -import groowt.util.di.QualifierHandler -import groowt.util.di.SingletonBinding +import com.jessebrault.di.Binding +import com.jessebrault.di.QualifierHandler +import com.jessebrault.di.SingletonBinding @TupleConstructor(includeFields = true) class InjectModelQualifierHandler implements QualifierHandler { diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelsQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelsQualifierHandler.groovy index 033ef55..869d7c6 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelsQualifierHandler.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelsQualifierHandler.groovy @@ -1,9 +1,9 @@ package com.jessebrault.ssg.di import groovy.transform.TupleConstructor -import groowt.util.di.Binding -import groowt.util.di.QualifierHandler -import groowt.util.di.SingletonBinding +import com.jessebrault.di.Binding +import com.jessebrault.di.QualifierHandler +import com.jessebrault.di.SingletonBinding @TupleConstructor(includeFields = true) class InjectModelsQualifierHandler implements QualifierHandler { diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectPageQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPageQualifierHandler.groovy index 2f45ef2..36b9e55 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/InjectPageQualifierHandler.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPageQualifierHandler.groovy @@ -2,9 +2,9 @@ package com.jessebrault.ssg.di import com.jessebrault.ssg.page.Page import groovy.transform.TupleConstructor -import groowt.util.di.Binding -import groowt.util.di.QualifierHandler -import groowt.util.di.SingletonBinding +import com.jessebrault.di.Binding +import com.jessebrault.di.QualifierHandler +import com.jessebrault.di.SingletonBinding @TupleConstructor(includeFields = true) class InjectPageQualifierHandler implements QualifierHandler { diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectPagesQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPagesQualifierHandler.groovy index adf5174..4a0003b 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/InjectPagesQualifierHandler.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPagesQualifierHandler.groovy @@ -3,9 +3,9 @@ package com.jessebrault.ssg.di import com.jessebrault.ssg.page.Page import com.jessebrault.ssg.util.Glob import groovy.transform.TupleConstructor -import groowt.util.di.Binding -import groowt.util.di.QualifierHandler -import groowt.util.di.SingletonBinding +import com.jessebrault.di.Binding +import com.jessebrault.di.QualifierHandler +import com.jessebrault.di.SingletonBinding @TupleConstructor(includeFields = true) class InjectPagesQualifierHandler implements QualifierHandler { diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextQualifierHandler.groovy index 1c98ecc..7337156 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextQualifierHandler.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextQualifierHandler.groovy @@ -2,9 +2,9 @@ package com.jessebrault.ssg.di import com.jessebrault.ssg.text.Text import groovy.transform.TupleConstructor -import groowt.util.di.Binding -import groowt.util.di.QualifierHandler -import groowt.util.di.SingletonBinding +import com.jessebrault.di.Binding +import com.jessebrault.di.QualifierHandler +import com.jessebrault.di.SingletonBinding @TupleConstructor(includeFields = true) class InjectTextQualifierHandler implements QualifierHandler { diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextsQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextsQualifierHandler.groovy index 63961ff..1f0691a 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextsQualifierHandler.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextsQualifierHandler.groovy @@ -3,9 +3,9 @@ package com.jessebrault.ssg.di import com.jessebrault.ssg.text.Text import com.jessebrault.ssg.util.Glob import groovy.transform.TupleConstructor -import groowt.util.di.Binding -import groowt.util.di.QualifierHandler -import groowt.util.di.SingletonBinding +import com.jessebrault.di.Binding +import com.jessebrault.di.QualifierHandler +import com.jessebrault.di.SingletonBinding @TupleConstructor(includeFields = true) class InjectTextsQualifierHandler implements QualifierHandler { diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/ModelsExtension.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/ModelsExtension.groovy index b65d97d..c3cefca 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/ModelsExtension.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/ModelsExtension.groovy @@ -1,9 +1,9 @@ package com.jessebrault.ssg.di import com.jessebrault.ssg.model.Model -import groowt.util.di.QualifierHandler -import groowt.util.di.QualifierHandlerContainer -import groowt.util.di.RegistryExtension +import com.jessebrault.di.QualifierHandler +import com.jessebrault.di.QualifierHandlerContainer +import com.jessebrault.di.RegistryExtension import java.lang.annotation.Annotation diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/PagesExtension.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/PagesExtension.groovy index b6491d5..79e4854 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/PagesExtension.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/PagesExtension.groovy @@ -1,9 +1,9 @@ package com.jessebrault.ssg.di import com.jessebrault.ssg.page.Page -import groowt.util.di.QualifierHandler -import groowt.util.di.QualifierHandlerContainer -import groowt.util.di.RegistryExtension +import com.jessebrault.di.QualifierHandler +import com.jessebrault.di.QualifierHandlerContainer +import com.jessebrault.di.RegistryExtension import java.lang.annotation.Annotation diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/SelfPageExtension.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/SelfPageExtension.groovy index d8f6537..63e8e88 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/SelfPageExtension.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/SelfPageExtension.groovy @@ -2,7 +2,7 @@ package com.jessebrault.ssg.di import com.jessebrault.ssg.page.Page import groovy.transform.TupleConstructor -import groowt.util.di.* +import com.jessebrault.di.* import java.lang.annotation.Annotation diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/SsgNamedRegistryExtension.java b/api/src/main/groovy/com/jessebrault/ssg/di/SsgNamedRegistryExtension.java index 2175188..ddb503b 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/SsgNamedRegistryExtension.java +++ b/api/src/main/groovy/com/jessebrault/ssg/di/SsgNamedRegistryExtension.java @@ -1,6 +1,6 @@ package com.jessebrault.ssg.di; -import groowt.util.di.*; +import com.jessebrault.di.*; import jakarta.inject.Named; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactoryUtil.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactoryUtil.groovy index 0d1bb49..916cc3c 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactoryUtil.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactoryUtil.groovy @@ -1,7 +1,7 @@ package com.jessebrault.ssg.di -import groowt.util.di.DefaultRegistryObjectFactory -import groowt.util.di.RegistryObjectFactory +import com.jessebrault.di.DefaultRegistryObjectFactory +import com.jessebrault.di.RegistryObjectFactory final class SsgObjectFactoryUtil { diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/TextsExtension.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/TextsExtension.groovy index d74f823..c9bee28 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/TextsExtension.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/TextsExtension.groovy @@ -1,9 +1,9 @@ package com.jessebrault.ssg.di import com.jessebrault.ssg.text.Text -import groowt.util.di.QualifierHandler -import groowt.util.di.QualifierHandlerContainer -import groowt.util.di.RegistryExtension +import com.jessebrault.di.QualifierHandler +import com.jessebrault.di.QualifierHandlerContainer +import com.jessebrault.di.RegistryExtension import java.lang.annotation.Annotation diff --git a/api/src/main/groovy/com/jessebrault/ssg/model/Models.groovy b/api/src/main/groovy/com/jessebrault/ssg/model/Models.groovy index 99c4fc1..27145f7 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/model/Models.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/model/Models.groovy @@ -1,7 +1,7 @@ package com.jessebrault.ssg.model -import groowt.util.fp.provider.NamedProvider -import groowt.util.fp.provider.Provider +import com.jessebrault.fp.provider.NamedProvider +import com.jessebrault.fp.provider.Provider import java.util.function.Supplier diff --git a/api/src/main/groovy/com/jessebrault/ssg/model/ProviderModel.groovy b/api/src/main/groovy/com/jessebrault/ssg/model/ProviderModel.groovy index 53a77be..794828e 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/model/ProviderModel.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/model/ProviderModel.groovy @@ -4,7 +4,7 @@ import groovy.transform.EqualsAndHashCode import groovy.transform.NullCheck import groovy.transform.PackageScope import groovy.transform.TupleConstructor -import groowt.util.fp.provider.Provider +import com.jessebrault.fp.provider.Provider @PackageScope @TupleConstructor(includeFields = true, defaults = false) diff --git a/api/src/main/groovy/com/jessebrault/ssg/page/DefaultWvcPage.groovy b/api/src/main/groovy/com/jessebrault/ssg/page/DefaultWvcPage.groovy index 263585f..675d53a 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/page/DefaultWvcPage.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/page/DefaultWvcPage.groovy @@ -5,8 +5,8 @@ import com.jessebrault.ssg.util.Diagnostic import com.jessebrault.ssg.view.PageView import com.jessebrault.ssg.view.WvcCompiler import com.jessebrault.ssg.view.WvcPageView -import groowt.util.di.RegistryObjectFactory -import groowt.util.fp.either.Either +import com.jessebrault.di.RegistryObjectFactory +import com.jessebrault.fp.either.Either class DefaultWvcPage extends AbstractPage implements Page { diff --git a/api/src/main/groovy/com/jessebrault/ssg/page/Page.groovy b/api/src/main/groovy/com/jessebrault/ssg/page/Page.groovy index e0c77b0..830a9e8 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/page/Page.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/page/Page.groovy @@ -2,7 +2,7 @@ package com.jessebrault.ssg.page import com.jessebrault.ssg.util.Diagnostic import com.jessebrault.ssg.view.PageView -import groowt.util.fp.either.Either +import com.jessebrault.fp.either.Either interface Page { diff --git a/api/src/main/groovy/com/jessebrault/ssg/util/ObjectUtil.groovy b/api/src/main/groovy/com/jessebrault/ssg/util/ObjectUtil.groovy index aac05ac..8109810 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/util/ObjectUtil.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/util/ObjectUtil.groovy @@ -1,7 +1,7 @@ package com.jessebrault.ssg.util -import groowt.util.fp.property.Property -import groowt.util.fp.provider.Provider +import com.jessebrault.fp.property.Property +import com.jessebrault.fp.provider.Provider import static java.util.Objects.requireNonNull diff --git a/api/src/main/groovy/com/jessebrault/ssg/view/WvcCompiler.groovy b/api/src/main/groovy/com/jessebrault/ssg/view/WvcCompiler.groovy index d9e137c..dc6a85e 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/view/WvcCompiler.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/view/WvcCompiler.groovy @@ -2,7 +2,7 @@ package com.jessebrault.ssg.view import com.jessebrault.ssg.util.Diagnostic import groovy.transform.TupleConstructor -import groowt.util.fp.either.Either +import com.jessebrault.fp.either.Either import groowt.view.component.ComponentTemplate import groowt.view.component.ViewComponent import groowt.view.component.compiler.ComponentTemplateClassFactory diff --git a/buildSrc/src/main/groovy/ssg-common.gradle b/buildSrc/src/main/groovy/ssg-common.gradle index 94f5c41..c6c3307 100644 --- a/buildSrc/src/main/groovy/ssg-common.gradle +++ b/buildSrc/src/main/groovy/ssg-common.gradle @@ -8,6 +8,11 @@ version '0.5.0-SNAPSHOT' repositories { mavenCentral() + + maven { + name = 'Gitea' + url = uri('https://git.jessebrault.com/api/packages/jessebrault/maven') + } } configurations { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5b27d70..f0a4c51 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,8 @@ [versions] classgraph = '4.8.179' commonmark = '0.24.0' +di = '0.1.0' +fp = '0.1.0' groovy = '4.0.27' groowt = '0.1.4' jetbrains-annotations = '26.0.2' @@ -15,6 +17,8 @@ slf4j = '2.0.17' classgraph = { module = 'io.github.classgraph:classgraph', version.ref = 'classgraph' } commonmark = { module = 'org.commonmark:commonmark', version.ref = 'commonmark' } commonmark-frontmatter = { module = 'org.commonmark:commonmark-ext-yaml-front-matter', version.ref = 'commonmark' } +di = { module = 'com.jessebrault.di:di', version.ref = 'di' } +fp = { module = 'com.jessebrault.fp:fp', version.ref = 'fp' } groovy = { module = 'org.apache.groovy:groovy', version.ref = 'groovy' } groovy-yaml = { module = 'org.apache.groovy:groovy-yaml', version.ref = 'groovy' } groowt-v = { module = 'groowt:views', version.ref = 'groowt' }