From 526a0035335367e398a8864ed6dc10b934998276 Mon Sep 17 00:00:00 2001 From: Jesse Brault Date: Sat, 28 Jun 2025 12:23:17 -0500 Subject: [PATCH] Update old usages of di to new package name. --- .../groovy/groowt/gradle/groowt-conventions.gradle | 5 +++++ gradle/libs.versions.toml | 2 ++ web-view-components-compiler/build.gradle | 2 +- .../view/component/web/ast/DefaultNodeFactory.java | 12 ++++++------ .../web/ast/extension/GStringPathExtension.java | 2 +- .../web/ast/extension/GStringScriptletExtension.java | 2 +- .../web/ast/extension/GroovyCodeNodeExtension.java | 2 +- .../web/ast/extension/SelfNodeRegistryExtension.java | 2 +- .../ast/extension/SimpleNodeExtensionFactory.java | 2 +- .../groowt/view/component/web/ast/node/BodyNode.java | 2 +- .../view/component/web/ast/node/BodyTextNode.java | 2 +- .../component/web/ast/node/BooleanValueAttrNode.java | 2 +- .../web/ast/node/ClassComponentTypeNode.java | 2 +- .../component/web/ast/node/ClosureValueNode.java | 2 +- .../component/web/ast/node/CompilationUnitNode.java | 2 +- .../component/web/ast/node/ComponentArgsNode.java | 2 +- .../web/ast/node/ComponentConstructorNode.java | 2 +- .../component/web/ast/node/ComponentValueNode.java | 2 +- .../component/web/ast/node/DollarReferenceNode.java | 2 +- .../component/web/ast/node/DollarScriptletNode.java | 2 +- .../web/ast/node/EmptyClosureValueNode.java | 2 +- .../component/web/ast/node/EqualsScriptletNode.java | 2 +- .../web/ast/node/FragmentComponentNode.java | 2 +- .../component/web/ast/node/GStringValueNode.java | 2 +- .../view/component/web/ast/node/HtmlCommentNode.java | 2 +- .../component/web/ast/node/JStringValueNode.java | 2 +- .../groowt/view/component/web/ast/node/KeyNode.java | 2 +- .../component/web/ast/node/KeyValueAttrNode.java | 2 +- .../component/web/ast/node/PlainScriptletNode.java | 2 +- .../view/component/web/ast/node/PreambleNode.java | 2 +- .../view/component/web/ast/node/QuestionNode.java | 2 +- .../web/ast/node/StringComponentTypeNode.java | 2 +- .../groowt/view/component/web/ast/node/TextNode.java | 2 +- .../component/web/ast/node/TypedComponentNode.java | 2 +- .../web/transpile/DefaultBodyTextTranspiler.java | 2 +- 35 files changed, 45 insertions(+), 38 deletions(-) diff --git a/buildSrc/src/main/groovy/groowt/gradle/groowt-conventions.gradle b/buildSrc/src/main/groovy/groowt/gradle/groowt-conventions.gradle index 0eabed7..00471bd 100644 --- a/buildSrc/src/main/groovy/groowt/gradle/groowt-conventions.gradle +++ b/buildSrc/src/main/groovy/groowt/gradle/groowt-conventions.gradle @@ -8,6 +8,11 @@ version = '0.1.4' repositories { mavenCentral() + + maven { + name = 'Gitea' + url = 'https://git.jessebrault.com/api/packages/jessebrault/maven' + } } java { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6cbf968..d459333 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,6 +4,7 @@ [versions] antlr = '4.13.2' asm = '9.8' +di = '0.1.0' groovy = '4.0.27' jakarta-inject = '2.0.1' jansi = '2.4.2' @@ -20,6 +21,7 @@ slf4j = '2.0.17' antlr = { module = 'org.antlr:antlr4', version.ref = 'antlr' } antlr-runtime = { module = 'org.antlr:antlr4-runtime', version.ref = 'antlr' } asm = { module = 'org.ow2.asm:asm', version.ref = 'asm' } +di = { module = 'com.jessebrault.di:di', version.ref = 'di' } groovy = { module = 'org.apache.groovy:groovy', version.ref = 'groovy' } groovy-console = { module = 'org.apache.groovy:groovy-console', version.ref = 'groovy' } groovy-templates = { module = 'org.apache.groovy:groovy-templates', version.ref = 'groovy' } diff --git a/web-view-components-compiler/build.gradle b/web-view-components-compiler/build.gradle index aef88d1..3e87564 100644 --- a/web-view-components-compiler/build.gradle +++ b/web-view-components-compiler/build.gradle @@ -62,7 +62,7 @@ dependencies { implementation libs.kotlin.stdlib implementation libs.jansi implementation libs.asm - implementation project(':di') + implementation libs.di implementation project(':extensible') groowtAntlr libs.antlr diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/DefaultNodeFactory.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/DefaultNodeFactory.java index 9192199..23f9607 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/DefaultNodeFactory.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/DefaultNodeFactory.java @@ -1,8 +1,8 @@ package groowt.view.component.web.ast; -import groowt.util.di.DefaultRegistryObjectFactory; -import groowt.util.di.Registry; -import groowt.util.di.RegistryObjectFactory; +import com.jessebrault.di.DefaultRegistryObjectFactory; +import com.jessebrault.di.Registry; +import com.jessebrault.di.RegistryObjectFactory; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.extension.*; import groowt.view.component.web.ast.node.*; @@ -13,9 +13,9 @@ import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Set; -import static groowt.util.di.BindingUtil.*; -import static groowt.util.di.filters.FilterHandlers.getAllowsTypesFilterHandler; -import static groowt.util.di.filters.IterableFilterHandlers.getIterableElementTypesFilterHandler; +import static com.jessebrault.di.BindingUtil.*; +import static com.jessebrault.di.filters.FilterHandlers.getAllowsTypesFilterHandler; +import static com.jessebrault.di.filters.IterableFilterHandlers.getIterableElementTypesFilterHandler; public class DefaultNodeFactory implements NodeFactory { diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GStringPathExtension.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GStringPathExtension.java index 5057b51..ebcdf3e 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GStringPathExtension.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GStringPathExtension.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.extension; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.node.Node; import groowt.view.component.web.util.TokenRange; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GStringScriptletExtension.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GStringScriptletExtension.java index 4841fc6..22b56a9 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GStringScriptletExtension.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GStringScriptletExtension.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.extension; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.node.Node; import groowt.view.component.web.util.TokenRange; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GroovyCodeNodeExtension.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GroovyCodeNodeExtension.java index 1d70680..41375df 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GroovyCodeNodeExtension.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/GroovyCodeNodeExtension.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.extension; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.node.Node; import groowt.view.component.web.util.TokenRange; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/SelfNodeRegistryExtension.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/SelfNodeRegistryExtension.java index f66bd37..86e3a9d 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/SelfNodeRegistryExtension.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/SelfNodeRegistryExtension.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.extension; -import groowt.util.di.*; +import com.jessebrault.di.*; import groowt.view.component.web.ast.node.Node; import org.jetbrains.annotations.Nullable; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/SimpleNodeExtensionFactory.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/SimpleNodeExtensionFactory.java index d70907a..acec4da 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/SimpleNodeExtensionFactory.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/extension/SimpleNodeExtensionFactory.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.extension; -import groowt.util.di.RegistryObjectFactory; +import com.jessebrault.di.RegistryObjectFactory; import groowt.view.component.web.ast.node.Node; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BodyNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BodyNode.java index ee09b1c..62a48a9 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BodyNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BodyNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BodyTextNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BodyTextNode.java index 4e61bcf..c2f423c 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BodyTextNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BodyTextNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BooleanValueAttrNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BooleanValueAttrNode.java index d88960f..12fef2b 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BooleanValueAttrNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/BooleanValueAttrNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ClassComponentTypeNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ClassComponentTypeNode.java index 833b415..85224db 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ClassComponentTypeNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ClassComponentTypeNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ClosureValueNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ClosureValueNode.java index 194c7b5..470d8f3 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ClosureValueNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ClosureValueNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.extension.GroovyCodeNodeExtension; import groowt.view.component.web.ast.extension.NodeExtensionContainer; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/CompilationUnitNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/CompilationUnitNode.java index 4dbde64..1d54639 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/CompilationUnitNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/CompilationUnitNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentArgsNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentArgsNode.java index 9dc7de8..1b1a38c 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentArgsNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentArgsNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentConstructorNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentConstructorNode.java index 9dcfc8e..8f63b50 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentConstructorNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentConstructorNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.extension.GroovyCodeNodeExtension; import groowt.view.component.web.ast.extension.NodeExtensionContainer; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentValueNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentValueNode.java index e0670b8..fa70579 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentValueNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/ComponentValueNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/DollarReferenceNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/DollarReferenceNode.java index 6677156..f4bc40e 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/DollarReferenceNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/DollarReferenceNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/DollarScriptletNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/DollarScriptletNode.java index c30e36d..595b5af 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/DollarScriptletNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/DollarScriptletNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/EmptyClosureValueNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/EmptyClosureValueNode.java index 65a5804..8d6d539 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/EmptyClosureValueNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/EmptyClosureValueNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.GroovyCodeNodeExtension; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/EqualsScriptletNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/EqualsScriptletNode.java index f5a26c8..3f90197 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/EqualsScriptletNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/EqualsScriptletNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/FragmentComponentNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/FragmentComponentNode.java index f069a82..ec05e6f 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/FragmentComponentNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/FragmentComponentNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/GStringValueNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/GStringValueNode.java index c234f2e..5d72010 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/GStringValueNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/GStringValueNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.extension.GroovyCodeNodeExtension; import groowt.view.component.web.ast.extension.NodeExtensionContainer; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/HtmlCommentNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/HtmlCommentNode.java index af05a24..10ac676 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/HtmlCommentNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/HtmlCommentNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/JStringValueNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/JStringValueNode.java index 78b9e30..f445e4d 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/JStringValueNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/JStringValueNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/KeyNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/KeyNode.java index dc6ab7a..59cba67 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/KeyNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/KeyNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/KeyValueAttrNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/KeyValueAttrNode.java index 4dcd76e..dd9fbee 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/KeyValueAttrNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/KeyValueAttrNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/PlainScriptletNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/PlainScriptletNode.java index 3717c80..42d18b5 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/PlainScriptletNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/PlainScriptletNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/PreambleNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/PreambleNode.java index 13b0629..7f1cda9 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/PreambleNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/PreambleNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.extension.GroovyCodeNodeExtension; import groowt.view.component.web.ast.extension.NodeExtensionContainer; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/QuestionNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/QuestionNode.java index 0504db5..10a17da 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/QuestionNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/QuestionNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/StringComponentTypeNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/StringComponentTypeNode.java index 948e80c..491a1b2 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/StringComponentTypeNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/StringComponentTypeNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.antlr.TokenList; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/TextNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/TextNode.java index 798c8c6..f2c82fc 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/TextNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/TextNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/TypedComponentNode.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/TypedComponentNode.java index 3c9b195..961ed1b 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/TypedComponentNode.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/ast/node/TypedComponentNode.java @@ -1,6 +1,6 @@ package groowt.view.component.web.ast.node; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.ast.extension.NodeExtensionContainer; import groowt.view.component.web.util.TokenRange; import jakarta.inject.Inject; diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/transpile/DefaultBodyTextTranspiler.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/transpile/DefaultBodyTextTranspiler.java index 0c11a63..9b97b84 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/transpile/DefaultBodyTextTranspiler.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/transpile/DefaultBodyTextTranspiler.java @@ -1,6 +1,6 @@ package groowt.view.component.web.transpile; -import groowt.util.di.annotation.Given; +import com.jessebrault.di.annotation.Given; import groowt.view.component.web.WebViewComponentBugError; import groowt.view.component.web.ast.node.*; import jakarta.inject.Inject;