Merge pull request #114 from xpenatan/master

Release v1.0.0-b9
xpenatan · Jan 11, 2024 · 6edbaa3 · 6edbaa3
2 parents 0f4b610 + baf782d
commit 6edbaa3
Show file tree

Hide file tree

Showing 31 changed files with 410 additions and 253 deletions.
diff --git a/.github/workflows/dispatch_build.yml b/.github/workflows/dispatch_build.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,4 +11,4 @@ jobs:
     with:
       isRelease: true
       shouldUpload: true
-    secrets: inherit
+    secrets: inherit
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -0,0 +1,38 @@
+name: Create Tag
+
+on:
+  push:
+    branches:
+      - 'release'
+
+jobs:
+  add-tag:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - uses: madhead/read-java-properties@latest
+        id: version
+        with:
+          file: "./gradle.properties"
+          property: version
+          default: 0.0.1
+
+      - name: Create Git tag
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const versionOutputs = ${{ toJSON(steps.version.outputs) }};
+            
+            var version = versionOutputs.value;
+            
+            console.log("Version: " + version);
+            
+            var ref = "refs/tags/" + version
+            github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: ref,
+              sha: context.sha
+            });
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,13 @@
 [1.0.0-SNAPSHOT]
+
+[1.0.0-b9]
+- add TeaClassFilter printAllowedClasses() and printExcludedClasses()
+- add TeaReflectionSupplier.printReflectionClasses()
+- Change exclude class comparison to regex
+- Downgrade teavm dev 0.10.X version to 0.9.2 release version
+- Remove tool/generator from maven/snapshot.
+
+[1.0.0-b8]
 - Fix MMB code
 - Fix catch key
 - Support IntBuffer in GL20

diff --git a/README.md b/README.md
@@ -41,7 +41,10 @@ repositories {
     }
 }
 ```
-    gdxTeaVMVersion = "1.0.0-SNAPSHOT"
+    // SNAPSHOT:
+    gdxTeaVMVersion = "-SNAPSHOT"
+    // RELEASE:
+    gdxTeaVMVersion = "[LAST_TAG_VERSION]"
 ```groovy
 // In teaVM module
 dependencies {
@@ -57,12 +60,5 @@ dependencies {
 - [Bullet](https://github.com/xpenatan/gdx-bullet) (WIP)
 - [PhysX](https://github.com/xpenatan/gdx-physx) (WIP)
 - [ImGui](https://github.com/xpenatan/gdx-imgui) (WIP)
+- [Lua](https://github.com/xpenatan/gdx-lua) (WIP)
 - FreeType
-
-## Generator:
-A WIP standalone tool to convert your libgdx game in .jar or .class format to javascript.  [Example](https://youtu.be/BIL_5eaxg9w)
-<br>
-<br>
-Note: The compiled jar game should not be obfuscated.
-
-Setup: TODO
diff --git a/backends/backend-teavm/emu/com/badlogic/gdx/graphics/PixmapEmu.java b/backends/backend-teavm/emu/com/badlogic/gdx/graphics/PixmapEmu.java
@@ -6,7 +6,6 @@
 import com.badlogic.gdx.utils.BufferUtils;
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.GdxRuntimeException;
-import com.badlogic.gdx.utils.IntMap;
 import com.github.xpenatan.gdx.backends.teavm.AssetLoaderListener;
 import com.github.xpenatan.gdx.backends.teavm.TeaApplication;
 import com.github.xpenatan.gdx.backends.teavm.TeaApplicationConfiguration;
@@ -101,7 +100,7 @@ public static int toGlType (FormatEmu format) {
     private Gdx2DPixmapEmu nativePixmap;
     private boolean disposed;
 
-    public static void downloadFromUrl(String url, final DownloadPixmapResponseListener responseListener) {
+    public static void downloadFromUrl(String url, final Pixmap.DownloadPixmapResponseListener responseListener) {
         AssetLoaderListener<Blob> listener = new AssetLoaderListener<>() {
             @Override
             public void onFailure(String url) {
@@ -112,7 +111,7 @@ public void onFailure(String url) {
             @Override
             public boolean onSuccess(String url, Blob result) {
                 Object obj = new PixmapEmu(result.getImage());
-                responseListener.downloadComplete((PixmapEmu)obj);
+                responseListener.downloadComplete((Pixmap)obj);
                 return false;
             }
         };
@@ -739,9 +738,4 @@ public enum BlendingEmu {
     public enum FilterEmu {
         NearestNeighbour, BiLinear
     }
-
-    public interface DownloadPixmapResponseListener {
-        void downloadComplete (PixmapEmu pixmap);
-        void downloadFailed (Throwable t);
-    }
 }
diff --git a/...backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaBuilder.java b/...backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaBuilder.java
@@ -75,7 +75,6 @@ public interface TeaProgressListener {
     private static final String EXTENSION_FREETYPE = "gdx-freetype-teavm";
     private static final String EXTENSION_BOX2D = "gdx-box2d-teavm";
     private static final String EXTENSION_BOX2D_GWT = "gdx-box2d-gwt";
-    private static final String EXTENSION_IMGUI = "imgui-core-teavm";
 
     public static TeaVMTool config(TeaBuildConfiguration configuration) {
         TeaVMTool tool = new TeaVMTool();
@@ -215,7 +214,6 @@ private static void sortAcceptedClassPath(ArrayList<URL> acceptedURL) {
         // Move extensions to be first so native classes are replaced by the emulated classes
         makeClassPathFirst(acceptedURL, EXTENSION_FREETYPE);
         makeClassPathFirst(acceptedURL, EXTENSION_BOX2D);
-        makeClassPathFirst(acceptedURL, EXTENSION_IMGUI);
         // Move generic backend to be first
         makeClassPathFirst(acceptedURL, "backend-teavm");
     }
@@ -430,8 +428,6 @@ else if(path.contains("gdx-jnigen"))
             isValid = ACCEPT_STATE.NOT_ACCEPT;
         else if(path.contains("gdx-platform"))
             isValid = ACCEPT_STATE.NOT_ACCEPT;
-        else if(path.contains("imgui-core"))
-            isValid = ACCEPT_STATE.NOT_ACCEPT;
         else if(path.contains("generator/core/"))
             isValid = ACCEPT_STATE.NOT_ACCEPT;
         else if(path.contains("gdx-bullet-platform"))
@@ -455,8 +451,6 @@ else if(path.contains(EXTENSION_FREETYPE))
             isValid = ACCEPT_STATE.ACCEPT;
         else if(path.contains(EXTENSION_BOX2D))
             isValid = ACCEPT_STATE.ACCEPT;
-        else if(path.contains(EXTENSION_IMGUI))
-            isValid = ACCEPT_STATE.ACCEPT;
         else if(path.contains("jParser-loader"))
             isValid = ACCEPT_STATE.ACCEPT;
         else if(path.contains("jzlib"))

diff --git a/.../src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaVMResourceProperties.java b/.../src/main/java/com/github/xpenatan/gdx/backends/teavm/config/TeaVMResourceProperties.java
@@ -5,6 +5,8 @@
 import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -111,6 +113,7 @@ private static ArrayList<TeaVMResourceProperties> getAllProperties(ArrayList<URL
         ArrayList<String> filteredUrl = new ArrayList<>();
         for(URL url : acceptedURL) {
             String path = url.getPath();
+            path = URLDecoder.decode(path, StandardCharsets.UTF_8);
             boolean accept = !(
                     !(path.endsWith(".jar")) ||
                             path.contains("org.teavm"

diff --git a/...m/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaClassFilter.java b/...m/src/main/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaClassFilter.java
@@ -1,5 +1,6 @@
 package com.github.xpenatan.gdx.backends.teavm.config.plugins;
 
+import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder;
 import java.util.ArrayList;
 import org.teavm.model.FieldReference;
 import org.teavm.model.MethodReference;
@@ -10,6 +11,10 @@ public class TeaClassFilter implements ElementFilter {
     private static final ArrayList<Pair> methodsToExclude = new ArrayList<>();
     private static final ArrayList<Pair> fieldsToExclude = new ArrayList<>();
 
+    private static final ArrayList<String> ALLOWED_CLASSES = new ArrayList<>();
+    private static final ArrayList<String> EXCLUDED_CLASSES = new ArrayList<>();
+
+
     /**
      * my.package.ClassName or my.package
      */
@@ -31,10 +36,32 @@ public static void addFieldsToExclude(String className, String fieldName) {
         fieldsToExclude.add(new Pair(className, fieldName));
     }
 
+    /**
+     * Must be called after TeaBuilder.build
+     */
+    public static void printAllowedClasses() {
+        TeaBuilder.logHeader("EXCLUDED CLASSES: " + ALLOWED_CLASSES.size());
+        for(String allowedClass : ALLOWED_CLASSES) {
+            TeaBuilder.log(allowedClass);
+        }
+        TeaBuilder.logEnd();
+    }
+
+    /**
+     * Must be called after TeaBuilder.build
+     */
+    public static void printExcludedClasses() {
+        TeaBuilder.logHeader("ALLOWED CLASES: " + EXCLUDED_CLASSES.size());
+        for(String excludedClass : EXCLUDED_CLASSES) {
+            TeaBuilder.log(excludedClass);
+        }
+        TeaBuilder.logEnd();
+    }
+
     private static boolean containsClass(ArrayList<String> list, String className) {
         for(int i = 0; i < list.size(); i++) {
             String excludedClass = list.get(i);
-            if(className.contains(excludedClass))
+            if(className.matches(excludedClass) || className.contains(excludedClass + "$") )
                 return true;
         }
         return false;
@@ -58,6 +85,12 @@ public boolean acceptClass(String fullClassName) {
         if(containsClass(classesToExclude, fullClassName)) {
             accceptClass = false;
         }
+        if(accceptClass) {
+            ALLOWED_CLASSES.add(fullClassName);
+        }
+        else {
+            EXCLUDED_CLASSES.add(fullClassName);
+        }
         return accceptClass;
     }
 

diff --git a/...ain/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaReflectionSupplier.java b/...ain/java/com/github/xpenatan/gdx/backends/teavm/config/plugins/TeaReflectionSupplier.java
@@ -1,5 +1,6 @@
 package com.github.xpenatan.gdx.backends.teavm.config.plugins;
 
+import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -17,6 +18,8 @@ public class TeaReflectionSupplier implements ReflectionSupplier {
 
     private static ArrayList<String> clazzList = new ArrayList();
 
+    private static HashSet<String> REFLECTION_CLASSES = new HashSet<>();
+
     public static void addReflectionClass(Class<?> type) {
         addReflectionClass(type.getName());
     }
@@ -41,6 +44,17 @@ public static void addReflectionClass(String className) {
         clazzList.add(className);
     }
 
+    /**
+     * Must be called after TeaBuilder.build
+     */
+    public static void printReflectionClasses() {
+        TeaBuilder.logHeader("REFLECTION CLASSES: " + REFLECTION_CLASSES.size());
+        for(String reflectionClass : REFLECTION_CLASSES) {
+            TeaBuilder.log(reflectionClass);
+        }
+        TeaBuilder.logEnd();
+    }
+
     public TeaReflectionSupplier() {
     }
 
@@ -54,6 +68,7 @@ public Collection<String> getAccessibleFields(ReflectionContext context, String
 
         if(cls != null) {
             if(canHaveReflection(className)) {
+                REFLECTION_CLASSES.add(className);
                 for(FieldReader field : cls.getFields()) {
                     String name = field.getName();
                     fields.add(name);
@@ -71,6 +86,7 @@ public Collection<MethodDescriptor> getAccessibleMethods(ReflectionContext conte
         }
         Set<MethodDescriptor> methods = new HashSet<>();
         if(canHaveReflection(className)) {
+            REFLECTION_CLASSES.add(className);
             Collection<? extends MethodReader> methods2 = cls.getMethods();
             for(MethodReader method : methods2) {
                 MethodDescriptor descriptor = method.getDescriptor();

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,10 +18,6 @@ subprojects {
         maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
         maven { url = uri("https://oss.sonatype.org/content/repositories/releases/") }
         maven { url = uri("https://oss.sonatype.org/content/repositories/releases/") }
-        maven {
-            url = uri("http://teavm.org/maven/repository/")
-            isAllowInsecureProtocol = true
-        }
         maven { url = uri("https://jitpack.io") }
     }
 
@@ -33,9 +29,7 @@ subprojects {
 
 var libProjects = mutableSetOf(
         project(":backends:backend-teavm"),
-        project(":extensions:gdx-freetype-teavm"),
-        project(":tools:generator:core"),
-        project(":tools:generator:ui")
+        project(":extensions:gdx-freetype-teavm")
 )
 
 configure(libProjects) {

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,25 +1,34 @@
+import java.io.File
+import java.util.*
+
 object LibExt {
     const val groupId = "com.github.xpenatan.gdx-teavm"
-    val libVersion: String = getVersion("1.0.0", "b8")
+
+    val libVersion: String = getVersion()
 
     const val gdxVersion = "1.12.1"
-    const val teaVMVersion = "0.10.0-dev-1"
+    const val teaVMVersion = "0.9.2"
 
     const val gdxImGuiVersion = "1.0.0-SNAPSHOT"
-    const val gdxFrameViewportVersion = "1.0.0-SNAPSHOT"
+    const val gdxMultiViewVersion = "1.0.0-SNAPSHOT"
 
     const val reflectionVersion = "0.10.2"
     const val jettyVersion = "11.0.13"
 
     const val aiVersion = "1.8.2"
 }
 
-private fun getVersion(releaseVersion: String, suffix: String = ""): String {
+private fun getVersion(): String {
+    val file = File("gradle.properties")
+    val properties = Properties()
+    properties.load(file.inputStream())
+    val version = properties.getProperty("version")
+
     val isRelease = System.getenv("RELEASE")
-    var libVersion = "${releaseVersion}-SNAPSHOT"
+    var libVersion = "-SNAPSHOT"
     if(isRelease != null && isRelease.toBoolean()) {
-        libVersion = releaseVersion + if(suffix.isNotEmpty()) "-${suffix}" else ""
+        libVersion = version
     }
-    System.out.println("Gdx-teaVM Version: " + libVersion)
+    println("gdx-teavm Version: $libVersion")
     return libVersion
 }
diff --git a/...s/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildTeaVMTestDemo.java b/...s/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildTeaVMTestDemo.java
@@ -19,7 +19,7 @@ public static void main(String[] args) throws IOException {
 
         TeaVMTool tool = TeaBuilder.config(teaBuildConfiguration);
         tool.setMainClass(TeaVMTestLauncher.class.getName());
-        tool.setObfuscated(false);
+        tool.setObfuscated(true);
         TeaBuilder.build(tool);
     }
 }
diff --git a/examples/gdx-tests/core/build.gradle.kts b/examples/gdx-tests/core/build.gradle.kts
@@ -8,10 +8,10 @@ dependencies {
     implementation("com.badlogicgames.gdx:gdx-backend-lwjgl3:${LibExt.gdxVersion}")
 
     implementation("com.github.xpenatan.gdx-imgui:imgui-core:${LibExt.gdxImGuiVersion}")
-    implementation("com.github.xpenatan.gdx-imgui:gdx:${LibExt.gdxImGuiVersion}")
+    implementation("com.github.xpenatan.gdx-imgui:gdx-impl:${LibExt.gdxImGuiVersion}")
 
     // Optional
-    implementation("com.github.xpenatan:gdx-frame-viewport:${LibExt.gdxFrameViewportVersion}")
+    implementation("com.github.xpenatan.gdx-multi-view:core:${LibExt.gdxMultiViewVersion}")
 
     api("com.badlogicgames.gdx:gdx-tests")