Skip to content

Commit 517cc07

Browse files
authored
ProGuard + tinylog again (Card-Forge#9976)
1 parent 71de41e commit 517cc07

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

forge-gui-android/proguard.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
-dontwarn java.net.**
4646
-dontwarn java.nio.**
4747
-dontwarn java.io.**
48-
-dontwarn org.slf4j.**
4948
-dontwarn javax.**
5049
-dontwarn module-info
5150
-dontwarn io.sentry.**
@@ -70,6 +69,8 @@
7069
# classes it considers unused, which removes the logging provider.
7170
-keep class org.tinylog.** { *; }
7271

72+
-keep class org.slf4j.** { *; }
73+
7374
-keep class forge.** { *; }
7475
-keep class com.thoughtworks.xstream.** { *; }
7576
-keep class org.apache.commons.lang3.** { *; }

forge-gui-android/src/forge/app/Main.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,6 @@ public AndroidAudio createAudio(Context context, AndroidApplicationConfiguration
162162
@Override
163163
protected void onCreate(Bundle savedInstanceState) {
164164
super.onCreate(savedInstanceState);
165-
// Register tinylog provider explicitly — the android-maven-plugin strips
166-
// META-INF/services/ from dependency JARs, so ServiceLoader discovery fails.
167-
org.tinylog.configuration.Configuration.set("provider", "org.tinylog.core.TinylogLoggingProvider");
168165
try {
169166
PackageInfo pInfo = getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), 0);
170167
versionString = pInfo.versionName;

0 commit comments

Comments
 (0)