From adc96982f29c4acf5adbb463bb2dbfccccaa4545 Mon Sep 17 00:00:00 2001 From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com> Date: Mon, 27 May 2024 10:16:12 +0200 Subject: [PATCH] Updated to match new package names of web-view-components. --- .../com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy | 4 +--- .../{SsgObjectFactory.groovy => SsgObjectFactoryUtil.groovy} | 4 ++-- .../main/groovy/com/jessebrault/ssg/view/WvcPageView.groovy | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) rename api/src/main/groovy/com/jessebrault/ssg/di/{SsgObjectFactory.groovy => SsgObjectFactoryUtil.groovy} (84%) diff --git a/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy b/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy index e822e48..8605485 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy @@ -15,9 +15,7 @@ import com.jessebrault.ssg.view.PageView import com.jessebrault.ssg.view.WvcPageView import groovy.transform.TupleConstructor import groowt.util.di.RegistryObjectFactory -import groowt.view.component.ViewComponent -import groowt.view.component.context.DefaultComponentContext -import groowt.view.web.DefaultWebViewComponentContext +import groowt.view.component.web.DefaultWebViewComponentContext import io.github.classgraph.ClassGraph import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactory.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactoryUtil.groovy similarity index 84% rename from api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactory.groovy rename to api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactoryUtil.groovy index 6e071bd..0d1bb49 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactory.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactoryUtil.groovy @@ -3,7 +3,7 @@ package com.jessebrault.ssg.di import groowt.util.di.DefaultRegistryObjectFactory import groowt.util.di.RegistryObjectFactory -final class SsgObjectFactory { +final class SsgObjectFactoryUtil { static RegistryObjectFactory getDefault() { DefaultRegistryObjectFactory.Builder.withDefaults().with { @@ -14,6 +14,6 @@ final class SsgObjectFactory { } } - private SsgObjectFactory() {} + private SsgObjectFactoryUtil() {} } diff --git a/api/src/main/groovy/com/jessebrault/ssg/view/WvcPageView.groovy b/api/src/main/groovy/com/jessebrault/ssg/view/WvcPageView.groovy index f103cbd..460e64c 100644 --- a/api/src/main/groovy/com/jessebrault/ssg/view/WvcPageView.groovy +++ b/api/src/main/groovy/com/jessebrault/ssg/view/WvcPageView.groovy @@ -4,7 +4,7 @@ import groowt.view.component.AbstractViewComponent import groowt.view.component.ComponentTemplate import groowt.view.component.compiler.ComponentTemplateCompileUnit import groowt.view.component.compiler.source.ComponentTemplateSource -import groowt.view.web.BaseWebViewComponent +import groowt.view.component.web.BaseWebViewComponent import java.util.function.Function