Switch to new com.jessebrault.di/fp.

This commit is contained in:
Jesse Brault 2025-06-30 07:38:25 -05:00
parent 807556cd73
commit 6ef7fb0117
25 changed files with 70 additions and 61 deletions

View File

@ -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

View File

@ -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 {

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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<InjectModel> {

View File

@ -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<InjectModels> {

View File

@ -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<InjectPage> {

View File

@ -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<InjectPages> {

View File

@ -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<InjectText> {

View File

@ -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<InjectTexts> {

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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 {

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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 {

View File

@ -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 {

View File

@ -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

View File

@ -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

View File

@ -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 {

View File

@ -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' }