chore: update gestalt to 8.0.0-SNAPSHOT

BenjaminAmos · May 24, 2021 · d252362 · d252362
1 parent ed2b293
commit d252362
Show file tree

Hide file tree

Showing 287 changed files with 379 additions and 297 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     implementation("dom4j:dom4j:1.6.1")
 
     // for inspecting modules
-    implementation("org.terasology.gestalt:gestalt-module:7.1.0-SNAPSHOT")
+    implementation("org.terasology.gestalt:gestalt-module:8.0.0-SNAPSHOT")
 
     api(kotlin("test"))
 }

diff --git a/build-logic/src/main/kotlin/terasology-module.gradle.kts b/build-logic/src/main/kotlin/terasology-module.gradle.kts
@@ -67,8 +67,14 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
     testImplementation("org.mockito:mockito-junit-jupiter:3.7.7")
+
+    annotationProcessor("org.terasology.gestalt:gestalt-inject-java:8.0.0-SNAPSHOT")
 }
 
+tasks.withType<JavaCompile> {
+    inputs.files(sourceSets.main.get().resources.srcDirs)
+    options.compilerArgs.add("-Aresource=${sourceSets.main.get().resources.srcDirs.joinToString(File.pathSeparator)}")
+}
 
 if (project.name == "ModuleTestingEnvironment") {
     dependencies {

diff --git a/engine-tests/src/main/java/org/terasology/unittest/ExampleClass.java b/engine-tests/src/main/java/org/terasology/unittest/ExampleClass.java
@@ -3,7 +3,7 @@
 
 package org.terasology.unittest;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API
 public class ExampleClass implements ExampleInterface {

diff --git a/engine-tests/src/main/java/org/terasology/unittest/ExampleInterface.java b/engine-tests/src/main/java/org/terasology/unittest/ExampleInterface.java
@@ -3,7 +3,7 @@
 
 package org.terasology.unittest;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API
 public interface ExampleInterface {

diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/package-info.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/package-info.java
@@ -4,4 +4,4 @@
 @API
 package org.terasology.unittest.stubs;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java b/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java
@@ -20,7 +20,7 @@
 import org.terasology.engine.core.module.ExternalApiWhitelist;
 import org.terasology.engine.core.module.ModuleManager;
 import org.terasology.gestalt.module.ModuleEnvironment;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.testUtil.ModuleManagerFactory;
 
 import java.net.URL;

diff --git a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java
@@ -22,7 +22,7 @@
 import org.terasology.engine.core.module.ExternalApiWhitelist;
 import org.terasology.engine.core.module.ModuleManager;
 import org.terasology.gestalt.module.ModuleEnvironment;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.testUtil.ModuleManagerFactory;
 
 import java.lang.reflect.Constructor;

diff --git a/...c/test/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactoryTest.java b/...c/test/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactoryTest.java
@@ -8,7 +8,7 @@
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleFactory;
 import org.terasology.gestalt.module.ModuleMetadata;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 import org.terasology.gestalt.naming.Version;
 import org.terasology.unittest.ExampleClass;
@@ -18,6 +18,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ClasspathCompromisingModuleFactoryTest {
     final static Class<?> someClassOutsideTheModule = ClasspathCompromisingModuleFactory.class;
@@ -46,10 +47,14 @@ public void archiveModuleContainsClass() throws IOException {
 
         Module module = factory.createArchiveModule(new File("FIXME.jar"));
 
-        Class<?> someClassInTheModule = module.getModuleManifest().getTypesAnnotatedWith(API.class).iterator().next();
+        try {
+            Class<?> someClassInTheModule = Class.forName(module.getClassIndex().getTypesAnnotatedWith(API.class.getName()).iterator().next());
 
-        assertTrue(module.getClassPredicate().test(someClassInTheModule));
-        assertFalse(module.getClassPredicate().test(someClassOutsideTheModule));
+            assertTrue(module.getClassPredicate().test(someClassInTheModule));
+            assertFalse(module.getClassPredicate().test(someClassOutsideTheModule));
+        } catch (ClassNotFoundException ignore) {
+            fail();
+        }
     }
 
     @Test

diff --git a/...ests/src/test/java/org/terasology/engine/core/module/ModuleDownloadListGeneratorTest.java b/...ests/src/test/java/org/terasology/engine/core/module/ModuleDownloadListGeneratorTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.reflections.Reflections;
 import org.terasology.engine.core.TerasologyConstants;
+import org.terasology.gestalt.di.index.UrlClassIndex;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleMetadata;
 import org.terasology.gestalt.module.ModuleRegistry;
@@ -86,7 +87,7 @@ private Module buildSimpleModule(String id, String version) {
         if (version != null) {
             metadata.setVersion(new Version(version));
         }
-        return new Module(metadata, new EmptyFileSource(), Collections.emptyList(), new Reflections(), (c) -> false);
+        return new Module(metadata, new EmptyFileSource(), Collections.emptyList(), UrlClassIndex.byClassLoader(), (c) -> false);
     }
     private Module buildEngineModule(String version) {
         return buildSimpleModule(TerasologyConstants.ENGINE_MODULE.toString(), version);

diff --git a/engine/build.gradle b/engine/build.gradle
@@ -103,18 +103,20 @@ dependencies {
     implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '4.10'
 
     // Our developed libs
-    api group: 'org.terasology.gestalt', name: 'gestalt-asset-core', version: '7.1.0-SNAPSHOT'
-    api group: 'org.terasology.gestalt', name: 'gestalt-module', version: '7.1.0-SNAPSHOT'
-    api group: 'org.terasology.gestalt', name: 'gestalt-util', version: '7.1.0-SNAPSHOT'
+    api group: 'org.terasology.gestalt', name: 'gestalt-asset-core', version: '8.0.0-SNAPSHOT'
+    api group: 'org.terasology.gestalt', name: 'gestalt-module', version: '8.0.0-SNAPSHOT'
+    api group: 'org.terasology.gestalt', name: 'gestalt-util', version: '8.0.0-SNAPSHOT'
     api "com.github.zafarkhaja:java-semver:0.10.0"  // ASAP: Remove after https://github.com/MovingBlocks/gestalt/pull/110
 
+    annotationProcessor "org.terasology.gestalt:gestalt-inject-java:8.0.0-SNAPSHOT"
+
     api group: 'org.terasology', name: 'TeraMath', version: '1.5.0'
     api group: 'org.terasology', name: 'splash-screen', version: '1.1.1'
     api group: 'org.terasology.jnlua', name: 'JNLua', version: '0.1.0-SNAPSHOT'
     api group: 'org.terasology.jnbullet', name: 'JNBullet', version: '1.0.2'
     api group: 'org.terasology.nui', name: 'nui', version: '3.0.0-SNAPSHOT'
     api group: 'org.terasology.nui', name: 'nui-reflect', version: '3.0.0-SNAPSHOT'
-    api group: 'org.terasology.nui', name: 'nui-gestalt7', version: '3.0.0-SNAPSHOT'
+    api group: 'org.terasology.nui', name: 'nui-gestalt', version: '3.0.0-SNAPSHOT'
 
 
     // Wildcard dependency to catch any libs provided with the project (remote repo preferred instead)
@@ -129,6 +131,11 @@ dependencies {
     api(project(":subsystems:TypeHandlerLibrary"))
 }
 
+compileJava {
+    inputs.files sourceSets.main.resources.srcDirs
+    options.compilerArgs = ["-Aresource=${sourceSets.main.resources.srcDirs.join(File.pathSeparator)}"]
+}
+
 // Instructions for packaging a jar file for the engine
 jar {
     // Unlike the content modules Gradle grabs the assets as they're in a resources directory. Need to avoid dupes tho

diff --git a/engine/src/main/java/org/terasology/engine/audio/events/package-info.java b/engine/src/main/java/org/terasology/engine/audio/events/package-info.java
@@ -29,4 +29,4 @@
  */
 @API package org.terasology.engine.audio.events;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/audio/package-info.java b/engine/src/main/java/org/terasology/engine/audio/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.audio;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/config/Config.java b/engine/src/main/java/org/terasology/engine/config/Config.java
@@ -18,17 +18,17 @@
 import org.terasology.engine.core.TerasologyConstants;
 import org.terasology.engine.core.subsystem.Resolution;
 import org.terasology.engine.entitySystem.Component;
+import org.terasology.gestalt.naming.Version;
+import org.terasology.gestalt.naming.gson.NameTypeAdapter;
+import org.terasology.gestalt.naming.gson.VersionTypeAdapter;
+import org.terasology.input.Input;
+import org.terasology.context.annotation.API;
+import org.terasology.gestalt.naming.Name;
 import org.terasology.engine.utilities.gson.CaseInsensitiveEnumTypeAdapterFactory;
 import org.terasology.engine.utilities.gson.InputHandler;
 import org.terasology.engine.utilities.gson.ResolutionHandler;
 import org.terasology.engine.utilities.gson.SetMultimapTypeAdapter;
 import org.terasology.engine.utilities.gson.UriTypeAdapterFactory;
-import org.terasology.gestalt.module.sandbox.API;
-import org.terasology.gestalt.naming.Name;
-import org.terasology.gestalt.naming.Version;
-import org.terasology.gestalt.naming.gson.NameTypeAdapter;
-import org.terasology.gestalt.naming.gson.VersionTypeAdapter;
-import org.terasology.input.Input;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

diff --git a/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java b/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java
@@ -17,7 +17,7 @@
 package org.terasology.engine.config;
 
 import org.terasology.engine.core.subsystem.Resolution;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.cameras.PerspectiveCameraSettings;
 import org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings.DisplayModeSetting;
 import org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings.ScreenshotSize;

diff --git a/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java b/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java
@@ -19,7 +19,7 @@
 import java.beans.PropertyChangeListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.world.WorldRendererImpl;
 import org.terasology.engine.utilities.subscribables.AbstractSubscribable;
 

diff --git a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.config.facade;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * TelemetryConfiguration is a wrapper for {@link org.terasology.engine.config.TelemetryConfig}.

diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java
@@ -4,6 +4,7 @@
 
 import com.google.common.collect.ImmutableList;
 import org.reflections.ReflectionUtils;
+import org.terasology.context.annotation.IndexInherited;
 import org.terasology.engine.config.flexible.internal.SettingBuilder;
 import org.terasology.engine.config.flexible.internal.SettingImplBuilder;
 import org.terasology.engine.core.SimpleUri;
@@ -18,6 +19,7 @@
  * Represents a config class that will be automatically initialized and rendered by the engine.
  * All settings must be contained in {@code public static} fields of type {@link Setting}.
  */
+@IndexInherited
 public abstract class AutoConfig {
     private SimpleUri id;
 

diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java b/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java
@@ -16,7 +16,7 @@
 package org.terasology.engine.config.flexible;
 
 import org.terasology.engine.config.flexible.constraints.SettingConstraint;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.reflection.TypeInfo;
 
 /**

diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java
@@ -15,4 +15,4 @@
  */
 @API package org.terasology.engine.config.flexible.constraints;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/ui/ConstraintWidgetFactory.java b/engine/src/main/java/org/terasology/engine/config/flexible/ui/ConstraintWidgetFactory.java
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.config.flexible.ui;
 
+import org.terasology.context.annotation.IndexInherited;
 import org.terasology.engine.config.flexible.Setting;
 import org.terasology.engine.config.flexible.constraints.SettingConstraint;
 import org.terasology.nui.UIWidget;
@@ -16,6 +17,7 @@
  * @param <T> type of setting
  * @param <C> concrete type of {@link SettingConstraint}
  */
+@IndexInherited
 public abstract class ConstraintWidgetFactory<T, C extends SettingConstraint<T>> {
     private Setting<T> setting;
 

diff --git a/engine/src/main/java/org/terasology/engine/context/Context.java b/engine/src/main/java/org/terasology/engine/context/Context.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.context;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Provides classes with the utility objects that belong to the context they are running in.

diff --git a/engine/src/main/java/org/terasology/engine/core/ComponentFieldUri.java b/engine/src/main/java/org/terasology/engine/core/ComponentFieldUri.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.core;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.util.Objects;

diff --git a/engine/src/main/java/org/terasology/engine/core/ComponentSystemManager.java b/engine/src/main/java/org/terasology/engine/core/ComponentSystemManager.java
@@ -21,7 +21,7 @@
 import org.terasology.engine.registry.InjectionHelper;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleEnvironment;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.util.List;

diff --git a/engine/src/main/java/org/terasology/engine/core/Observer.java b/engine/src/main/java/org/terasology/engine/core/Observer.java
@@ -3,7 +3,7 @@
 
 package org.terasology.engine.core;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * A general interface for observers

diff --git a/engine/src/main/java/org/terasology/engine/core/SimpleUri.java b/engine/src/main/java/org/terasology/engine/core/SimpleUri.java
@@ -4,7 +4,7 @@
 
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 /**

diff --git a/engine/src/main/java/org/terasology/engine/core/Time.java b/engine/src/main/java/org/terasology/engine/core/Time.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.core;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * The timer manages all time in the game.

diff --git a/engine/src/main/java/org/terasology/engine/core/Uri.java b/engine/src/main/java/org/terasology/engine/core/Uri.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.core;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 /**

diff --git a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java
@@ -16,7 +16,7 @@
 
 package org.terasology.engine.core.bootstrap;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.lang.annotation.Annotation;

diff --git a/.../java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java b/.../java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java
@@ -17,7 +17,7 @@
 
 import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Event which is triggered when LocalPlayer is setup with a character entity. Allows for detection of when LocalPlayer is

diff --git a/...e/src/main/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactory.java b/...e/src/main/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactory.java
@@ -39,7 +39,7 @@ public Module createDirectoryModule(ModuleMetadata metadata, File directory) {
         Module module = super.createDirectoryModule(metadata, directory);
         return new Module(
                 module.getMetadata(), module.getResources(),
-                module.getClasspaths(), module.getModuleManifest(),
+                module.getClasspaths(), module.getClassIndex(),
                 new ClassesInModule(module));
     }
 
@@ -48,7 +48,7 @@ public Module createArchiveModule(ModuleMetadata metadata, File archive) throws
         Module module = super.createArchiveModule(metadata, archive);
         return new Module(
                 module.getMetadata(), module.getResources(),
-                module.getClasspaths(), module.getModuleManifest(),
+                module.getClasspaths(), module.getClassIndex(),
                 new ClassesInModule(module));
     }
 
@@ -71,7 +71,8 @@ static class ClassesInModule implements Predicate<Class<?>> {
                     throw new RuntimeException(e);
                 }
             }).collect(ImmutableSet.toImmutableSet());
-            classLoaders = module.getModuleManifest().getConfiguration().getClassLoaders();
+            //classLoaders = module.getModuleManifest().getConfiguration().getClassLoaders();
+            classLoaders = new ClassLoader[0]; // TODO
             name = module.getId().toString();
         }
 

diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.core.module;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java
@@ -23,6 +23,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.terasology.engine.core.TerasologyConstants;
+import org.terasology.gestalt.di.index.UrlClassIndex;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleMetadata;
 import org.terasology.gestalt.module.ModuleMetadataJsonAdapter;
@@ -73,7 +74,7 @@ public ModuleRegistry call() throws IOException {
 
                 ModuleMetadata meta = metaReader.read(new StringReader(json));
                 logger.debug("Read module {} - {}", meta.getId(), meta.getVersion());
-                modules.add(new Module(meta, new EmptyFileSource(), Collections.emptyList(), new Reflections(),
+                modules.add(new Module(meta, new EmptyFileSource(), Collections.emptyList(), UrlClassIndex.byClassLoader(),
                         (c) -> false));
             }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@

		@API package org.terasology.engine.audio;

		import org.terasology.gestalt.module.sandbox.API;
		import org.terasology.context.annotation.API;