Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@

<!-- Module Dependency Versions -->
<assertj.version>3.27.7</assertj.version>
<base.version>0.29.0</base.version>
<base.version>0.30.0</base.version>
<byte-buddy.version>1.18.4</byte-buddy.version>
<codemodel.version>0.25.0</codemodel.version>
<codemodel.version>0.26.0</codemodel.version>
<junit.version>6.0.3</junit.version>
<jakarta-inject.version>2.0.1</jakarta-inject.version>
<mockito.version>5.23.0</mockito.version>
Expand Down Expand Up @@ -226,12 +226,12 @@
</dependency>
<dependency>
<groupId>build.codemodel</groupId>
<artifactId>dependency-injection</artifactId>
<artifactId>codemodel-dependency-injection</artifactId>
<version>${codemodel.version}</version>
</dependency>
<dependency>
<groupId>build.codemodel</groupId>
<artifactId>jdk-codemodel</artifactId>
<artifactId>codemodel-jdk</artifactId>
<version>${codemodel.version}</version>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions spawn-application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@

<dependency>
<groupId>build.codemodel</groupId>
<artifactId>dependency-injection</artifactId>
<artifactId>codemodel-dependency-injection</artifactId>
</dependency>

<dependency>
<groupId>build.codemodel</groupId>
<artifactId>jdk-codemodel</artifactId>
<artifactId>codemodel-jdk</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
import build.base.table.option.CellSeparator;
import build.base.table.option.RowComparator;
import build.base.table.option.TableName;
import build.codemodel.dependency.injection.Binding;
import build.codemodel.dependency.injection.Context;
import build.codemodel.dependency.injection.Dependency;
import build.codemodel.dependency.injection.Resolver;
import build.codemodel.dependency.injection.ValueBinding;
import build.codemodel.foundation.usage.GenericTypeUsage;
import build.codemodel.injection.Binding;
import build.codemodel.injection.Context;
import build.codemodel.injection.Dependency;
import build.codemodel.injection.Resolver;
import build.codemodel.injection.ValueBinding;
import build.spawn.application.facet.Facet;
import build.spawn.application.facet.Faceted;
import build.spawn.application.option.Argument;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
import build.base.option.TemporaryDirectory;
import build.base.option.WorkingDirectory;
import build.base.table.Table;
import build.codemodel.dependency.injection.ConfigurationResolver;
import build.codemodel.dependency.injection.Context;
import build.codemodel.dependency.injection.InjectionFramework;
import build.codemodel.foundation.naming.CachingNameProvider;
import build.codemodel.foundation.naming.NonCachingNameProvider;
import build.codemodel.injection.ConfigurationResolver;
import build.codemodel.injection.Context;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.jdk.JDKCodeModel;
import build.spawn.application.option.LaunchIdentity;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
*/

import build.base.configuration.Configuration;
import build.codemodel.injection.Context;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.dependency.injection.Context;
import build.codemodel.dependency.injection.InjectionFramework;
import build.codemodel.jdk.JDKCodeModel;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import build.base.configuration.CollectedOption;
import build.base.foundation.Preconditions;
import build.codemodel.injection.Context;
import build.codemodel.dependency.injection.Context;

import java.util.List;
import java.util.Objects;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* #L%
*/

import build.codemodel.injection.Context;
import build.codemodel.dependency.injection.Context;

import java.util.Optional;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* #L%
*/

import build.codemodel.injection.Context;
import build.codemodel.dependency.injection.Context;

import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
Expand Down
2 changes: 1 addition & 1 deletion spawn-application/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
requires transitive build.base.network;
requires transitive build.base.option;

requires transitive build.codemodel.injection;
requires transitive build.codemodel.dependency.injection;
requires transitive build.codemodel.jdk;
requires transitive build.codemodel.foundation;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import build.base.foundation.iterator.matching.IteratorPatternMatchers;
import build.codemodel.foundation.naming.NonCachingNameProvider;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.dependency.injection.InjectionFramework;
import build.codemodel.jdk.JDKCodeModel;
import build.spawn.application.facet.facets.Address;
import build.spawn.application.facet.facets.Hobbies;
Expand Down
6 changes: 3 additions & 3 deletions spawn-docker-jdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

<dependency>
<groupId>build.codemodel</groupId>
<artifactId>dependency-injection</artifactId>
<artifactId>codemodel-dependency-injection</artifactId>
</dependency>


Expand Down Expand Up @@ -97,7 +97,7 @@

<dependency>
<groupId>build.codemodel</groupId>
<artifactId>jdk-codemodel</artifactId>
<artifactId>codemodel-jdk</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -134,7 +134,7 @@
<configuration>
<ignoredNonTestScopedDependencies>
<ignoredNonTestScopedDependency>build.codemodel:codemodel-foundation</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>build.codemodel:jdk-codemodel</ignoredNonTestScopedDependency>
<ignoredNonTestScopedDependency>build.codemodel:codemodel-jdk</ignoredNonTestScopedDependency>
</ignoredNonTestScopedDependencies>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
import build.base.option.Email;
import build.base.option.Password;
import build.base.option.Username;
import build.codemodel.injection.ConfigurationResolver;
import build.codemodel.injection.Context;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.dependency.injection.ConfigurationResolver;
import build.codemodel.dependency.injection.Context;
import build.codemodel.dependency.injection.InjectionFramework;
import build.spawn.docker.Event;
import build.spawn.docker.Image;
import build.spawn.docker.Images;
Expand Down Expand Up @@ -112,7 +112,7 @@ public class AbstractSession
/**
* Constructs an {@link AbstractSession} using the specified {@link HttpTransport} and {@link Configuration}.
*
* @param injectionFramework the {@link InjectionFramework} to use for {@link build.codemodel.injection.Dependency} injection
* @param injectionFramework the {@link InjectionFramework} to use for {@link build.codemodel.dependency.injection.Dependency} injection
* @param transport the {@link HttpTransport} for communicating with the Docker Engine
* @param configuration the {@link Configuration}
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

import build.base.configuration.Configuration;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.dependency.injection.InjectionFramework;
import build.spawn.docker.Session;
import jakarta.inject.Inject;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

import build.base.configuration.Configuration;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.dependency.injection.InjectionFramework;
import build.spawn.docker.Session;
import jakarta.inject.Inject;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

import build.base.configuration.Configuration;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.dependency.injection.InjectionFramework;
import build.spawn.docker.Session;
import jakarta.inject.Inject;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

import build.base.configuration.Configuration;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.dependency.injection.InjectionFramework;

import java.net.InetSocketAddress;
import java.net.http.HttpClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

import build.base.configuration.Configuration;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.dependency.injection.InjectionFramework;
import build.spawn.docker.Session;
import jakarta.inject.Inject;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* #L%
*/

import build.codemodel.injection.Context;
import build.codemodel.dependency.injection.Context;
import build.spawn.docker.jdk.HttpTransport;
import jakarta.inject.Inject;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import build.base.json.JsonValue;
import build.base.naming.UniqueNameGenerator;
import build.base.option.HostName;
import build.codemodel.injection.Context;
import build.codemodel.dependency.injection.Context;
import build.spawn.docker.Container;
import build.spawn.docker.Image;
import build.spawn.docker.jdk.HttpTransport;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import build.base.json.Json;
import build.base.json.JsonValue;
import build.codemodel.injection.Context;
import build.codemodel.dependency.injection.Context;
import build.spawn.docker.Container;
import build.spawn.docker.jdk.HttpTransport;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import build.base.io.Terminal;
import build.base.json.JsonNumber;
import build.base.json.JsonString;
import build.codemodel.injection.Context;
import build.codemodel.injection.PostInject;
import build.codemodel.dependency.injection.Context;
import build.codemodel.dependency.injection.PostInject;
import build.spawn.docker.Container;
import build.spawn.docker.Event;
import build.spawn.docker.Executable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import build.base.configuration.Configuration;
import build.base.json.JsonString;
import build.codemodel.injection.Context;
import build.codemodel.dependency.injection.Context;
import build.spawn.docker.Container;
import build.spawn.docker.Image;
import build.spawn.docker.jdk.command.CreateContainer;
Expand Down
2 changes: 1 addition & 1 deletion spawn-docker-jdk/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

requires build.codemodel.foundation;
requires build.codemodel.jdk;
requires build.codemodel.injection;
requires build.codemodel.dependency.injection;

requires transitive build.base.naming;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import build.base.configuration.Option;
import build.base.naming.UniqueNameGenerator;
import build.codemodel.foundation.naming.NonCachingNameProvider;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.dependency.injection.InjectionFramework;
import build.codemodel.jdk.JDKCodeModel;
import build.spawn.docker.Container;
import build.spawn.docker.DockerContextBuilder;
Expand Down
2 changes: 1 addition & 1 deletion spawn-docker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<dependency>
<groupId>build.codemodel</groupId>
<artifactId>dependency-injection</artifactId>
<artifactId>codemodel-dependency-injection</artifactId>
</dependency>

<!-- Test Dependencies -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import build.base.configuration.Configuration;
import build.base.configuration.Option;
import build.codemodel.injection.InjectionFramework;
import build.codemodel.dependency.injection.InjectionFramework;

import java.util.Objects;
import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion spawn-docker/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
requires build.base.io;
requires build.base.flow;

requires transitive build.codemodel.injection;
requires transitive build.codemodel.dependency.injection;

exports build.spawn.docker;
exports build.spawn.docker.option;
Expand Down
Loading