.gitea/workflows/check-publish-release.yml

@@ -1,27 +0,0 @@
-name: Ssg Check, Publish, and Release
-on:
-  push:
-    tags:
-      - v*
-jobs:
-  ci:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v4
-      - name: Setup Java.
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 21
-      - name: Check libraries
-        run: ./gradlew check
-      - name: Publish to git.jessebrault.com
-        run: ./gradlew publishAllPublicationsToGiteaRepository
-      - name: Release to git.jessebrault.com
-        uses: https://gitea.com/actions/release-action@main
-        with:
-          files: |-
-            cli/build/distributions/*.tar
-            cli/build/distributions/*.zip
-          api_key: '${{secrets.RELEASE_TOKEN}}'

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: StaticSiteGenerator Release
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: adopt
+          cache: gradle
+      - name: Gradle Test
+        run: ./gradlew test
+      - name: Gradle Install
+        run: ./gradlew :cli:assembleDist
+      - name: Release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: 'cli/build/distributions/*.tar,cli/build/distributions/*.zip'
+          name: ${{ env.GITHUB_REF_NAME }}
+          tag: ${{ env.GITHUB_REF_NAME }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          

api/build.gradle

@@ -23,8 +23,8 @@ dependencies {
     api libs.groowt.v
     api libs.groowt.vc
     api libs.groowt.wvc
-    api libs.di
+    api libs.groowt.fp
-    api libs.fp
+    api libs.groowt.di
 
     compileOnlyApi libs.jetbrains.anontations
 
@@ -44,10 +44,6 @@ jar {
     archivesBaseName = 'ssg-api'
 }
 
-sourcesJar {
-    archiveBaseName = 'ssg-api'
-}
-
 publishing {
     publications {
         create('ssgApi', MavenPublication) {

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 com.jessebrault.di.ObjectFactory
+import groowt.util.di.ObjectFactory
-import com.jessebrault.di.RegistryObjectFactory
+import groowt.util.di.RegistryObjectFactory
-import com.jessebrault.fp.option.Option
+import groowt.util.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 com.jessebrault.di.BindingUtil.named
+import static groowt.util.di.BindingUtil.named
-import static com.jessebrault.di.BindingUtil.toSingleton
+import static groowt.util.di.BindingUtil.toSingleton
 
 @TupleConstructor(includeFields = true, defaults = false)
 class DefaultStaticSiteGenerator implements StaticSiteGenerator {

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 com.jessebrault.di.RegistryObjectFactory
+import groowt.util.di.RegistryObjectFactory
-import com.jessebrault.fp.provider.Provider
+import groowt.util.fp.provider.Provider
 
 import static com.jessebrault.ssg.util.ObjectUtil.requireProvider
 import static com.jessebrault.ssg.util.ObjectUtil.requireString

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 com.jessebrault.di.DefaultRegistryObjectFactory
+import groowt.util.di.DefaultRegistryObjectFactory
-import com.jessebrault.di.RegistryObjectFactory
+import groowt.util.di.RegistryObjectFactory
-import com.jessebrault.fp.property.DefaultProperty
+import groowt.util.fp.property.DefaultProperty
-import com.jessebrault.fp.property.Property
+import groowt.util.fp.property.Property
-import com.jessebrault.fp.provider.DefaultProvider
+import groowt.util.fp.provider.DefaultProvider
-import com.jessebrault.fp.provider.NamedProvider
+import groowt.util.fp.provider.NamedProvider
-import com.jessebrault.fp.provider.Provider
+import groowt.util.fp.provider.Provider
 
 import java.nio.file.Path
 import java.util.function.Supplier

api/src/main/groovy/com/jessebrault/ssg/di/GlobalsExtension.groovy

@@ -1,11 +1,11 @@
 package com.jessebrault.ssg.di
 
 import groovy.transform.TupleConstructor
-import com.jessebrault.di.Binding
+import groowt.util.di.Binding
-import com.jessebrault.di.QualifierHandler
+import groowt.util.di.QualifierHandler
-import com.jessebrault.di.QualifierHandlerContainer
+import groowt.util.di.QualifierHandlerContainer
-import com.jessebrault.di.RegistryExtension
+import groowt.util.di.RegistryExtension
-import com.jessebrault.di.SingletonBinding
+import groowt.util.di.SingletonBinding
 
 import java.lang.annotation.Annotation
 

api/src/main/groovy/com/jessebrault/ssg/di/InjectModelQualifierHandler.groovy

@@ -1,9 +1,9 @@
 package com.jessebrault.ssg.di
 
 import groovy.transform.TupleConstructor
-import com.jessebrault.di.Binding
+import groowt.util.di.Binding
-import com.jessebrault.di.QualifierHandler
+import groowt.util.di.QualifierHandler
-import com.jessebrault.di.SingletonBinding
+import groowt.util.di.SingletonBinding
 
 @TupleConstructor(includeFields = true)
 class InjectModelQualifierHandler implements QualifierHandler<InjectModel> {

api/src/main/groovy/com/jessebrault/ssg/di/InjectModelsQualifierHandler.groovy

@@ -1,9 +1,9 @@
 package com.jessebrault.ssg.di
 
 import groovy.transform.TupleConstructor
-import com.jessebrault.di.Binding
+import groowt.util.di.Binding
-import com.jessebrault.di.QualifierHandler
+import groowt.util.di.QualifierHandler
-import com.jessebrault.di.SingletonBinding
+import groowt.util.di.SingletonBinding
 
 @TupleConstructor(includeFields = true)
 class InjectModelsQualifierHandler implements QualifierHandler<InjectModels> {

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 com.jessebrault.di.Binding
+import groowt.util.di.Binding
-import com.jessebrault.di.QualifierHandler
+import groowt.util.di.QualifierHandler
-import com.jessebrault.di.SingletonBinding
+import groowt.util.di.SingletonBinding
 
 @TupleConstructor(includeFields = true)
 class InjectPageQualifierHandler implements QualifierHandler<InjectPage> {

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 com.jessebrault.di.Binding
+import groowt.util.di.Binding
-import com.jessebrault.di.QualifierHandler
+import groowt.util.di.QualifierHandler
-import com.jessebrault.di.SingletonBinding
+import groowt.util.di.SingletonBinding
 
 @TupleConstructor(includeFields = true)
 class InjectPagesQualifierHandler implements QualifierHandler<InjectPages> {

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 com.jessebrault.di.Binding
+import groowt.util.di.Binding
-import com.jessebrault.di.QualifierHandler
+import groowt.util.di.QualifierHandler
-import com.jessebrault.di.SingletonBinding
+import groowt.util.di.SingletonBinding
 
 @TupleConstructor(includeFields = true)
 class InjectTextQualifierHandler implements QualifierHandler<InjectText> {

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 com.jessebrault.di.Binding
+import groowt.util.di.Binding
-import com.jessebrault.di.QualifierHandler
+import groowt.util.di.QualifierHandler
-import com.jessebrault.di.SingletonBinding
+import groowt.util.di.SingletonBinding
 
 @TupleConstructor(includeFields = true)
 class InjectTextsQualifierHandler implements QualifierHandler<InjectTexts> {

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 com.jessebrault.di.QualifierHandler
+import groowt.util.di.QualifierHandler
-import com.jessebrault.di.QualifierHandlerContainer
+import groowt.util.di.QualifierHandlerContainer
-import com.jessebrault.di.RegistryExtension
+import groowt.util.di.RegistryExtension
 
 import java.lang.annotation.Annotation
 

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 com.jessebrault.di.QualifierHandler
+import groowt.util.di.QualifierHandler
-import com.jessebrault.di.QualifierHandlerContainer
+import groowt.util.di.QualifierHandlerContainer
-import com.jessebrault.di.RegistryExtension
+import groowt.util.di.RegistryExtension
 
 import java.lang.annotation.Annotation
 

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 com.jessebrault.di.*
+import groowt.util.di.*
 
 import java.lang.annotation.Annotation
 

api/src/main/groovy/com/jessebrault/ssg/di/SsgNamedRegistryExtension.java

@@ -1,6 +1,6 @@
 package com.jessebrault.ssg.di;
 
-import com.jessebrault.di.*;
+import groowt.util.di.*;
 import jakarta.inject.Named;
 import org.jetbrains.annotations.Nullable;
 

api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactoryUtil.groovy

@@ -1,7 +1,7 @@
 package com.jessebrault.ssg.di
 
-import com.jessebrault.di.DefaultRegistryObjectFactory
+import groowt.util.di.DefaultRegistryObjectFactory
-import com.jessebrault.di.RegistryObjectFactory
+import groowt.util.di.RegistryObjectFactory
 
 final class SsgObjectFactoryUtil {
 

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 com.jessebrault.di.QualifierHandler
+import groowt.util.di.QualifierHandler
-import com.jessebrault.di.QualifierHandlerContainer
+import groowt.util.di.QualifierHandlerContainer
-import com.jessebrault.di.RegistryExtension
+import groowt.util.di.RegistryExtension
 
 import java.lang.annotation.Annotation
 

api/src/main/groovy/com/jessebrault/ssg/model/Models.groovy

@@ -1,7 +1,7 @@
 package com.jessebrault.ssg.model
 
-import com.jessebrault.fp.provider.NamedProvider
+import groowt.util.fp.provider.NamedProvider
-import com.jessebrault.fp.provider.Provider
+import groowt.util.fp.provider.Provider
 
 import java.util.function.Supplier
 

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 com.jessebrault.fp.provider.Provider
+import groowt.util.fp.provider.Provider
 
 @PackageScope
 @TupleConstructor(includeFields = true, defaults = false)

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 com.jessebrault.di.RegistryObjectFactory
+import groowt.util.di.RegistryObjectFactory
-import com.jessebrault.fp.either.Either
+import groowt.util.fp.either.Either
 
 class DefaultWvcPage extends AbstractPage implements Page {
 

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 com.jessebrault.fp.either.Either
+import groowt.util.fp.either.Either
 
 interface Page {
 

api/src/main/groovy/com/jessebrault/ssg/util/ObjectUtil.groovy

@@ -1,7 +1,7 @@
 package com.jessebrault.ssg.util
 
-import com.jessebrault.fp.property.Property
+import groowt.util.fp.property.Property
-import com.jessebrault.fp.provider.Provider
+import groowt.util.fp.provider.Provider
 
 import static java.util.Objects.requireNonNull
 

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 com.jessebrault.fp.either.Either
+import groowt.util.fp.either.Either
 import groowt.view.component.ComponentTemplate
 import groowt.view.component.ViewComponent
 import groowt.view.component.compiler.ComponentTemplateClassFactory

buildSrc/src/main/groovy/ssg-common.gradle

@@ -4,15 +4,10 @@ plugins {
 }
 
 group 'com.jessebrault.ssg'
-version '0.6.0-SNAPSHOT'
+version '0.5.0-SNAPSHOT'
 
 repositories {
     mavenCentral()
-
-    maven {
-        name = 'Gitea'
-        url = uri('https://git.jessebrault.com/api/packages/jessebrault/maven')
-    }
 }
 
 configurations {

cli/build.gradle

@@ -31,11 +31,7 @@ java {
 }
 
 jar {
-    archivesBaseName = 'ssg-cli'
+    archivesBaseName = "ssg-cli"
-}
-
-sourcesJar {
-    archiveBaseName = 'ssg-cli'
 }
 
 distributions {

gradle/libs.versions.toml

@@ -1,8 +1,6 @@
 [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'
@@ -17,8 +15,6 @@ 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' }