Skip to content

Commit 65d2029

Browse files
committed
Update reflection method
1 parent 91821f8 commit 65d2029

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

backends/backend-shared/src/main/java/com/github/xpenatan/gdx/teavm/backends/shared/config/compiler/TeaBackend.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ private void initializeTeavmTool(TeaCompilerData data) {
7878
tool.addSourceFileProvider(data.sourceFileProviders.get(i));
7979
}
8080
List<String> classesToPreserve = tool.getClassesToPreserve();
81-
classesToPreserve.addAll(data.reflectionClasses);
82-
TeaReflectionSupplier.addReflectionClass(data.reflectionClasses);
81+
classesToPreserve.addAll(data.finalReflectionClasses);
82+
TeaReflectionSupplier.addReflectionClass(data.finalReflectionClasses);
8383
tool.setDebugInformationGenerated(data.debugInformationGenerated);
8484
tool.setSourceMapsFileGenerated(data.sourceMapsFileGenerated);
8585
tool.setMinHeapSize(data.minHeapSize);
@@ -161,7 +161,7 @@ private void setupReflection(TeaCompilerData data, ArrayList<URL> acceptedURL) {
161161
add = data.reflectionListener.shouldEnableReflection(name);
162162
}
163163
if(add) {
164-
data.reflectionClasses.add(name);
164+
data.finalReflectionClasses.add(name);
165165
}
166166
}
167167
}

backends/backend-shared/src/main/java/com/github/xpenatan/gdx/teavm/backends/shared/config/compiler/TeaCompiler.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,12 @@ public TeaCompiler setMaxDirectBuffersSize(int maxDirectBuffersSize) {
7777
return this;
7878
}
7979

80-
public TeaCompiler addReflectionClass(String fullClassName) {
81-
data.reflectionClasses.add(fullClassName);
82-
return this;
83-
}
84-
8580
public TeaCompiler setReflectionListener(DefaultReflectionListener reflectionListener) {
8681
data.reflectionListener = reflectionListener;
8782
return this;
8883
}
8984

90-
public TeaCompiler addReflectionPattern(String classOrPackage) {
85+
public TeaCompiler addReflectionClass(String classOrPackage) {
9186
data.reflectionListener.addClassOrPackage(classOrPackage);
9287
return this;
9388
}

backends/backend-shared/src/main/java/com/github/xpenatan/gdx/teavm/backends/shared/config/compiler/TeaCompilerData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ public class TeaCompilerData {
2424
public int maxHeapSize = 128 * (1 << 20);
2525
public int minDirectBuffersSize = 2 * (1 << 20);
2626
public int maxDirectBuffersSize = 32 * (1 << 20);
27-
public final ArrayList<String> reflectionClasses = new ArrayList<>();
27+
public final ArrayList<String> finalReflectionClasses = new ArrayList<>(); // used internally
2828
public DefaultReflectionListener reflectionListener = new DefaultReflectionListener();
2929
}

0 commit comments

Comments
 (0)