diff --git a/build.gradle b/build.gradle index 0ae7be4..a917c6f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,29 +1,15 @@ plugins { - id 'com.jessebrault.ssg' version '0.5.0-SNAPSHOT' + id 'com.jessebrault.ssg' version '0.6.3' id 'distribution' } group = 'com.jessebrault' -version = '0.1.1-SNAPSHOT' +version = '0.1.2' repositories { mavenCentral() maven { - url 'https://archiva.jessebrault.com/repository/snapshots/' - - credentials { - username System.getenv('JBARCHIVA_USERNAME') - password System.getenv('JBARCHIVA_PASSWORD') - } - } - - maven { - url 'https://archiva.jessebrault.com/repository/internal/' - - credentials { - username System.getenv('JBARCHIVA_USERNAME') - password System.getenv('JBARCHIVA_PASSWORD') - } + url 'https://git.jessebrault.com/api/packages/jessebrault/maven' } } @@ -36,9 +22,9 @@ sourceSets { } dependencies { - implementation 'org.apache.groovy:groovy:4.0.25' + implementation 'org.apache.groovy:groovy:4.0.27' - implementation 'com.jessebrault.ssg:cli:0.5.0-SNAPSHOT' + implementation 'com.jessebrault.ssg:cli:0.6.3' serverImplementation 'org.eclipse.jetty:jetty-server:12.0.9' serverImplementation 'info.picocli:picocli:4.7.6' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 002b867..bad7c24 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/pages/groovy/com/jessebrault/site/composition/CompositionPageFactory.groovy b/pages/groovy/com/jessebrault/site/composition/CompositionPageFactory.groovy index 2ce1a07..e3457cc 100644 --- a/pages/groovy/com/jessebrault/site/composition/CompositionPageFactory.groovy +++ b/pages/groovy/com/jessebrault/site/composition/CompositionPageFactory.groovy @@ -3,7 +3,7 @@ package com.jessebrault.site.composition import com.jessebrault.ssg.page.Page import com.jessebrault.ssg.page.PageFactory import com.jessebrault.ssg.view.WvcCompiler -import groowt.util.di.RegistryObjectFactory +import com.jessebrault.di.RegistryObjectFactory import jakarta.inject.Inject class CompositionPageFactory implements PageFactory { diff --git a/pages/groovy/com/jessebrault/site/composition/CompositionPageType.groovy b/pages/groovy/com/jessebrault/site/composition/CompositionPageType.groovy index cb403d8..ed0010a 100644 --- a/pages/groovy/com/jessebrault/site/composition/CompositionPageType.groovy +++ b/pages/groovy/com/jessebrault/site/composition/CompositionPageType.groovy @@ -3,7 +3,7 @@ package com.jessebrault.site.composition import com.jessebrault.ssg.page.DefaultWvcPage import com.jessebrault.ssg.util.Diagnostic import com.jessebrault.ssg.view.PageView -import groowt.util.fp.either.Either +import com.jessebrault.fp.either.Either class CompositionPageType extends DefaultWvcPage { diff --git a/settings.gradle b/settings.gradle index bae2b6a..d9040e9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,12 +2,7 @@ pluginManagement { repositories { mavenCentral() maven { - url 'https://archiva.jessebrault.com/repository/snapshots/' - - credentials { - username System.getenv('JBARCHIVA_USERNAME') - password System.getenv('JBARCHIVA_PASSWORD') - } + url 'https://git.jessebrault.com/api/packages/jessebrault/maven' } } } diff --git a/ssg/default.groovy b/ssg/default.groovy index fc8e42f..0b4316d 100644 --- a/ssg/default.groovy +++ b/ssg/default.groovy @@ -3,7 +3,7 @@ import com.jessebrault.site.util.TitleMaker import com.jessebrault.ssg.buildscript.BuildScriptBase import groovy.transform.BaseScript -import static groowt.util.di.BindingUtil.toSelf +import static com.jessebrault.di.BindingUtil.toSelf @BaseScript BuildScriptBase base