Update old usages of di to new package name.

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 {

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

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

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 com.jessebrault.di.DefaultRegistryObjectFactory;
-import groowt.util.di.Registry;
+import com.jessebrault.di.Registry;
-import groowt.util.di.RegistryObjectFactory;
+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 com.jessebrault.di.BindingUtil.*;
-import static groowt.util.di.filters.FilterHandlers.getAllowsTypesFilterHandler;
+import static com.jessebrault.di.filters.FilterHandlers.getAllowsTypesFilterHandler;
-import static groowt.util.di.filters.IterableFilterHandlers.getIterableElementTypesFilterHandler;
+import static com.jessebrault.di.filters.IterableFilterHandlers.getIterableElementTypesFilterHandler;
 
 public class DefaultNodeFactory implements NodeFactory {
 

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;