diff --git a/forge-game/pom.xml b/forge-game/pom.xml index bfa81cdef44..b745929b2bc 100644 --- a/forge-game/pom.xml +++ b/forge-game/pom.xml @@ -32,7 +32,7 @@ io.sentry sentry-logback - 7.15.0 + 8.18.0 org.jgrapht diff --git a/forge-gui-android/libs/arm64-v8a/libsentry-android.so b/forge-gui-android/libs/arm64-v8a/libsentry-android.so new file mode 100644 index 00000000000..5045c320ee2 Binary files /dev/null and b/forge-gui-android/libs/arm64-v8a/libsentry-android.so differ diff --git a/forge-gui-android/libs/arm64-v8a/libsentry.so b/forge-gui-android/libs/arm64-v8a/libsentry.so new file mode 100644 index 00000000000..f46c4c57dd8 Binary files /dev/null and b/forge-gui-android/libs/arm64-v8a/libsentry.so differ diff --git a/forge-gui-android/libs/armeabi-v7a/libsentry-android.so b/forge-gui-android/libs/armeabi-v7a/libsentry-android.so new file mode 100644 index 00000000000..8d27dc366f5 Binary files /dev/null and b/forge-gui-android/libs/armeabi-v7a/libsentry-android.so differ diff --git a/forge-gui-android/libs/armeabi-v7a/libsentry.so b/forge-gui-android/libs/armeabi-v7a/libsentry.so new file mode 100644 index 00000000000..d5e8567e749 Binary files /dev/null and b/forge-gui-android/libs/armeabi-v7a/libsentry.so differ diff --git a/forge-gui-android/libs/sentrynativendk.jar b/forge-gui-android/libs/sentrynativendk.jar new file mode 100644 index 00000000000..ad071facbd7 Binary files /dev/null and b/forge-gui-android/libs/sentrynativendk.jar differ diff --git a/forge-gui-android/libs/x86/libsentry-android.so b/forge-gui-android/libs/x86/libsentry-android.so new file mode 100644 index 00000000000..0966e27b461 Binary files /dev/null and b/forge-gui-android/libs/x86/libsentry-android.so differ diff --git a/forge-gui-android/libs/x86/libsentry.so b/forge-gui-android/libs/x86/libsentry.so new file mode 100644 index 00000000000..9b2ebdb0086 Binary files /dev/null and b/forge-gui-android/libs/x86/libsentry.so differ diff --git a/forge-gui-android/libs/x86_64/libsentry-android.so b/forge-gui-android/libs/x86_64/libsentry-android.so new file mode 100644 index 00000000000..83c1d997bfd Binary files /dev/null and b/forge-gui-android/libs/x86_64/libsentry-android.so differ diff --git a/forge-gui-android/libs/x86_64/libsentry.so b/forge-gui-android/libs/x86_64/libsentry.so new file mode 100644 index 00000000000..8e776039ec7 Binary files /dev/null and b/forge-gui-android/libs/x86_64/libsentry.so differ diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index 416e7ff9639..499d2df9118 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -145,10 +145,17 @@ system ${pom.basedir}/libs/gdx-backend-android.jar + + io.sentry + sentry-native-ndk + 0.8.4 + system + ${pom.basedir}/libs/sentrynativendk.jar + io.sentry sentry-android - 7.15.0 + 8.18.0 aar @@ -159,13 +166,17 @@ io.sentry sentry-android-ndk + + org.jetbrains + annotations + io.sentry sentry-android-core - 7.15.0 + 8.18.0 aar @@ -185,7 +196,7 @@ io.sentry sentry-android-ndk - 7.15.0 + 8.18.0 aar @@ -222,7 +233,7 @@ org.jetbrains annotations - 26.0.1 + 26.0.2 compile diff --git a/forge-gui-android/proguard.cfg b/forge-gui-android/proguard.cfg index e27735afa2a..1b2f6d0c88a 100644 --- a/forge-gui-android/proguard.cfg +++ b/forge-gui-android/proguard.cfg @@ -57,6 +57,8 @@ ## Support library -dontwarn android.** -dontwarn androidx.** +# don't warn jetbrains annotations +-dontwarn org.jetbrains.annotations.** -dontwarn forge.** @@ -79,6 +81,11 @@ ##-keep class io.sentry.Sentry -keep class io.sentry.** { *; } -keepclassmembers enum io.sentry.** { *; } +# The Android SDK checks at runtime if this class is available via Class.forName +-keep class io.sentry.ndk.SentryNdk { *; } +# The JNI layer uses this class through reflection +-keep class io.sentry.ndk.NdkOptions { *; } +-keep class io.sentry.ndk.DebugImage { *; } -keep class io.netty.util.internal.logging.** { *; } -keep class net.jpountz.** { *; } -keep class com.ray3k.** { *; } diff --git a/forge-gui-android/src/main/AndroidManifest.xml b/forge-gui-android/src/main/AndroidManifest.xml index d7cd2a7e9cb..1c69d27ab2b 100644 --- a/forge-gui-android/src/main/AndroidManifest.xml +++ b/forge-gui-android/src/main/AndroidManifest.xml @@ -62,6 +62,13 @@ android:exported="false"> + + + + + + +