diff --git a/backends/backend-teavm/emu/com/artemis/utils/reflect/FieldGen.java b/backends/backend-teavm/emu/com/artemis/utils/reflect/FieldGen.java index eed569a9..ae2ae00f 100644 --- a/backends/backend-teavm/emu/com/artemis/utils/reflect/FieldGen.java +++ b/backends/backend-teavm/emu/com/artemis/utils/reflect/FieldGen.java @@ -2,7 +2,7 @@ import com.badlogic.gdx.utils.reflect.ArrayReflection; import com.badlogic.gdx.utils.reflect.ReflectionException; -import com.github.xpenatan.gdx.backends.teavm.plugins.TeaReflectionSupplier; +import com.github.xpenatan.gdx.backends.teavm.config.plugins.TeaReflectionSupplier; import com.github.xpenatan.gdx.backends.teavm.utils.GenericTypeProvider; import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; diff --git a/backends/backend-teavm/emu/com/badlogic/gdx/utils/reflect/FieldGen.java b/backends/backend-teavm/emu/com/badlogic/gdx/utils/reflect/FieldGen.java index 96557d0f..e090019d 100644 --- a/backends/backend-teavm/emu/com/badlogic/gdx/utils/reflect/FieldGen.java +++ b/backends/backend-teavm/emu/com/badlogic/gdx/utils/reflect/FieldGen.java @@ -1,6 +1,6 @@ package com.badlogic.gdx.utils.reflect; -import com.github.xpenatan.gdx.backends.teavm.plugins.TeaReflectionSupplier; +import com.github.xpenatan.gdx.backends.teavm.config.plugins.TeaReflectionSupplier; import com.github.xpenatan.gdx.backends.teavm.utils.GenericTypeProvider; import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; diff --git a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/preloader/AssetsCopy.java b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/AssetsCopy.java similarity index 96% rename from backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/preloader/AssetsCopy.java rename to backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/AssetsCopy.java index ddb32f70..25d195f7 100644 --- a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/preloader/AssetsCopy.java +++ b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/AssetsCopy.java @@ -1,8 +1,11 @@ -package com.github.xpenatan.gdx.backends.teavm.preloader; +package com.github.xpenatan.gdx.backends.teavm.config; import com.badlogic.gdx.utils.GdxRuntimeException; -import com.github.xpenatan.gdx.backends.teavm.TeaBuilder; import com.github.xpenatan.gdx.backends.teavm.TeaClassLoader; +import com.github.xpenatan.gdx.backends.teavm.preloader.AssetFilter; +import com.github.xpenatan.gdx.backends.teavm.preloader.AssetType; +import com.github.xpenatan.gdx.backends.teavm.preloader.DefaultAssetFilter; +import com.github.xpenatan.gdx.backends.teavm.preloader.FileWrapper; import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/TeaBuilder.java b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaBuilder.java similarity index 98% rename from backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/TeaBuilder.java rename to backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaBuilder.java index 06f7e62c..f3d720ea 100644 --- a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/TeaBuilder.java +++ b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaBuilder.java @@ -1,11 +1,12 @@ -package com.github.xpenatan.gdx.backends.teavm; +package com.github.xpenatan.gdx.backends.teavm.config; import com.badlogic.gdx.files.FileHandle; +import com.github.xpenatan.gdx.backends.teavm.TeaBuildConfiguration; +import com.github.xpenatan.gdx.backends.teavm.TeaClassLoader; import com.github.xpenatan.gdx.backends.teavm.gen.SkipClass; -import com.github.xpenatan.gdx.backends.teavm.plugins.TeaClassTransformer; -import com.github.xpenatan.gdx.backends.teavm.plugins.TeaReflectionSupplier; +import com.github.xpenatan.gdx.backends.teavm.config.plugins.TeaClassTransformer; +import com.github.xpenatan.gdx.backends.teavm.config.plugins.TeaReflectionSupplier; import com.github.xpenatan.gdx.backends.teavm.preloader.AssetFilter; -import com.github.xpenatan.gdx.backends.teavm.preloader.AssetsCopy; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -399,6 +400,8 @@ private static void scriptsDefault(ArrayList filePath) { filePath.add("box2D.js"); filePath.add("box2D.wasm.js"); filePath.add("box2D.wasm.wasm"); + filePath.add("exampleLib.js"); + filePath.add("exampleLib.wasm.wasm"); } private static ACCEPT_STATE acceptPath(String path) { diff --git a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/JavaObjectExporterDependency.java b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/JavaObjectExporterDependency.java similarity index 94% rename from backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/JavaObjectExporterDependency.java rename to backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/JavaObjectExporterDependency.java index 6faf2c5b..3597e14c 100644 --- a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/JavaObjectExporterDependency.java +++ b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/JavaObjectExporterDependency.java @@ -1,4 +1,4 @@ -package com.github.xpenatan.gdx.backends.teavm.plugins; +package com.github.xpenatan.gdx.backends.teavm.config.plugins; import org.teavm.dependency.AbstractDependencyListener; import org.teavm.dependency.DependencyAgent; diff --git a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaClassFilter.java b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaClassFilter.java similarity index 97% rename from backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaClassFilter.java rename to backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaClassFilter.java index 12ef2962..7b364114 100644 --- a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaClassFilter.java +++ b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaClassFilter.java @@ -1,4 +1,4 @@ -package com.github.xpenatan.gdx.backends.teavm.plugins; +package com.github.xpenatan.gdx.backends.teavm.config.plugins; import java.util.ArrayList; import org.teavm.model.FieldReference; diff --git a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaClassTransformer.java b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaClassTransformer.java similarity index 99% rename from backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaClassTransformer.java rename to backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaClassTransformer.java index dddfa98f..afa183e0 100644 --- a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaClassTransformer.java +++ b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaClassTransformer.java @@ -1,4 +1,4 @@ -package com.github.xpenatan.gdx.backends.teavm.plugins; +package com.github.xpenatan.gdx.backends.teavm.config.plugins; import com.github.xpenatan.gdx.backends.teavm.dom.CanvasRenderingContext2DWrapper; import com.github.xpenatan.gdx.backends.teavm.dom.DocumentWrapper; diff --git a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaPlugin.java b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaPlugin.java similarity index 86% rename from backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaPlugin.java rename to backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaPlugin.java index 402943f1..5fa6b10e 100644 --- a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaPlugin.java +++ b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaPlugin.java @@ -1,4 +1,4 @@ -package com.github.xpenatan.gdx.backends.teavm.plugins; +package com.github.xpenatan.gdx.backends.teavm.config.plugins; import org.teavm.jso.impl.JSOPlugin; import org.teavm.vm.spi.Before; diff --git a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaReflectionSupplier.java b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaReflectionSupplier.java similarity index 97% rename from backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaReflectionSupplier.java rename to backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaReflectionSupplier.java index b7e483d0..c401fb76 100644 --- a/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/plugins/TeaReflectionSupplier.java +++ b/backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaReflectionSupplier.java @@ -1,4 +1,4 @@ -package com.github.xpenatan.gdx.backends.teavm.plugins; +package com.github.xpenatan.gdx.backends.teavm.config.plugins; import java.util.ArrayList; import java.util.Collection; diff --git a/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.classlib.ReflectionSupplier b/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.classlib.ReflectionSupplier index ebd715b7..24b1b8c4 100644 --- a/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.classlib.ReflectionSupplier +++ b/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.classlib.ReflectionSupplier @@ -1 +1 @@ -com.github.xpenatan.gdx.backends.teavm.plugins.TeaReflectionSupplier \ No newline at end of file +com.github.xpenatan.gdx.backends.teavm.config.plugins.TeaReflectionSupplier \ No newline at end of file diff --git a/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.vm.spi.ElementFilter b/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.vm.spi.ElementFilter index d5724de8..839db546 100644 --- a/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.vm.spi.ElementFilter +++ b/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.vm.spi.ElementFilter @@ -1 +1 @@ -com.github.xpenatan.gdx.backends.teavm.plugins.TeaClassFilter \ No newline at end of file +com.github.xpenatan.gdx.backends.teavm.config.plugins.TeaClassFilter \ No newline at end of file diff --git a/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin b/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin index 59a45235..64d2e941 100644 --- a/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin +++ b/backends/backend-teavm/src/main/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin @@ -1 +1 @@ -com.github.xpenatan.gdx.backends.teavm.plugins.TeaPlugin \ No newline at end of file +com.github.xpenatan.gdx.backends.teavm.config.plugins.TeaPlugin \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index 1a62affd..0d6981bc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -17,7 +17,7 @@ project.ext { teaVMVersion = "0.9.0-dev-7" gdxVersion = "1.12.0" - jParserVersion = "1.0.0-b3" + jParserVersion = "1.0.0-SNAPSHOT" gdxImGuiVersion = '1.0.0-SNAPSHOT' gdxFrameViewportVersion = "1.0.0-SNAPSHOT" diff --git a/examples/box2d/teavm/src/main/java/com/github/xpenatan/gdx/examples/box2d/Build.java b/examples/box2d/teavm/src/main/java/com/github/xpenatan/gdx/examples/box2d/Build.java index 2ba768ad..dccd501d 100644 --- a/examples/box2d/teavm/src/main/java/com/github/xpenatan/gdx/examples/box2d/Build.java +++ b/examples/box2d/teavm/src/main/java/com/github/xpenatan/gdx/examples/box2d/Build.java @@ -1,7 +1,7 @@ package com.github.xpenatan.gdx.examples.box2d; import com.github.xpenatan.gdx.backends.teavm.TeaBuildConfiguration; -import com.github.xpenatan.gdx.backends.teavm.TeaBuilder; +import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder; import com.github.xpenatan.gdx.backends.teavm.gen.SkipClass; import java.io.File; import java.io.IOException; diff --git a/examples/bullet/teavm/src/main/java/com/github/xpenatan/gdx/examples/bullet/Build.java b/examples/bullet/teavm/src/main/java/com/github/xpenatan/gdx/examples/bullet/Build.java index 697fbe8d..d7ac3849 100644 --- a/examples/bullet/teavm/src/main/java/com/github/xpenatan/gdx/examples/bullet/Build.java +++ b/examples/bullet/teavm/src/main/java/com/github/xpenatan/gdx/examples/bullet/Build.java @@ -1,7 +1,7 @@ package com.github.xpenatan.gdx.examples.bullet; import com.github.xpenatan.gdx.backends.teavm.TeaBuildConfiguration; -import com.github.xpenatan.gdx.backends.teavm.TeaBuilder; +import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder; import com.github.xpenatan.gdx.backends.teavm.gen.SkipClass; import java.io.File; import java.io.IOException; diff --git a/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildArtemisTest.java b/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildArtemisTest.java index c3bbd29a..d80ff19c 100644 --- a/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildArtemisTest.java +++ b/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildArtemisTest.java @@ -1,8 +1,8 @@ package com.github.xpenatan.gdx.examples.teavm; import com.github.xpenatan.gdx.backends.teavm.TeaBuildConfiguration; -import com.github.xpenatan.gdx.backends.teavm.TeaBuilder; -import com.github.xpenatan.gdx.backends.teavm.plugins.TeaReflectionSupplier; +import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder; +import com.github.xpenatan.gdx.backends.teavm.config.plugins.TeaReflectionSupplier; import com.github.xpenatan.gdx.backends.teavm.gen.SkipClass; import com.github.xpenatan.gdx.examples.tests.ArtemisTest; import java.io.File; diff --git a/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildGearsDemo.java b/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildGearsDemo.java index ee14cdbc..10dbe32d 100644 --- a/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildGearsDemo.java +++ b/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildGearsDemo.java @@ -1,7 +1,7 @@ package com.github.xpenatan.gdx.examples.teavm; import com.github.xpenatan.gdx.backends.teavm.TeaBuildConfiguration; -import com.github.xpenatan.gdx.backends.teavm.TeaBuilder; +import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder; import com.github.xpenatan.gdx.backends.teavm.gen.SkipClass; import com.github.xpenatan.gdx.examples.teavm.launcher.GearsTestLauncher; import java.io.File; diff --git a/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildLoadingTest.java b/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildLoadingTest.java index 73ab9cc0..9295ec91 100644 --- a/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildLoadingTest.java +++ b/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildLoadingTest.java @@ -1,7 +1,7 @@ package com.github.xpenatan.gdx.examples.teavm; import com.github.xpenatan.gdx.backends.teavm.TeaBuildConfiguration; -import com.github.xpenatan.gdx.backends.teavm.TeaBuilder; +import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder; import com.github.xpenatan.gdx.backends.teavm.gen.SkipClass; import com.github.xpenatan.gdx.examples.teavm.launcher.LoadingTestLauncher; import java.io.File; diff --git a/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildReflectionTest.java b/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildReflectionTest.java index d2241d68..f2078e7c 100644 --- a/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildReflectionTest.java +++ b/examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildReflectionTest.java @@ -1,8 +1,8 @@ package com.github.xpenatan.gdx.examples.teavm; import com.github.xpenatan.gdx.backends.teavm.TeaBuildConfiguration; -import com.github.xpenatan.gdx.backends.teavm.TeaBuilder; -import com.github.xpenatan.gdx.backends.teavm.plugins.TeaReflectionSupplier; +import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder; +import com.github.xpenatan.gdx.backends.teavm.config.plugins.TeaReflectionSupplier; import com.github.xpenatan.gdx.backends.teavm.gen.SkipClass; import com.github.xpenatan.gdx.examples.tests.ReflectionTest; import java.io.File; diff --git a/examples/freetype/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildFreetypeTest.java b/examples/freetype/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildFreetypeTest.java index 3705c239..9f9e836c 100644 --- a/examples/freetype/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildFreetypeTest.java +++ b/examples/freetype/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildFreetypeTest.java @@ -1,7 +1,7 @@ package com.github.xpenatan.gdx.examples.teavm; import com.github.xpenatan.gdx.backends.teavm.TeaBuildConfiguration; -import com.github.xpenatan.gdx.backends.teavm.TeaBuilder; +import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder; import com.github.xpenatan.gdx.backends.teavm.gen.SkipClass; import com.github.xpenatan.gdx.examples.teavm.launcher.FreetypeTestLauncher; import java.io.File; diff --git a/tools/generator/core/src/main/java/com/github/xpenatan/teavm/generator/core/viewmodel/GeneratorViewModel.java b/tools/generator/core/src/main/java/com/github/xpenatan/teavm/generator/core/viewmodel/GeneratorViewModel.java index e4ac7c5f..686b71f2 100644 --- a/tools/generator/core/src/main/java/com/github/xpenatan/teavm/generator/core/viewmodel/GeneratorViewModel.java +++ b/tools/generator/core/src/main/java/com/github/xpenatan/teavm/generator/core/viewmodel/GeneratorViewModel.java @@ -1,7 +1,7 @@ package com.github.xpenatan.teavm.generator.core.viewmodel; import com.github.xpenatan.gdx.backends.teavm.TeaBuildConfiguration; -import com.github.xpenatan.gdx.backends.teavm.TeaBuilder; +import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder; import com.github.xpenatan.teavm.generator.core.utils.server.JettyServer; import java.io.File; import java.net.MalformedURLException;