From 5f7e7ac2913de385bd03f0fa67974865d10188b3 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Fri, 20 Jan 2023 13:57:50 -0600 Subject: [wallet] Fixed JNI issue with Proguard. --- wallet/build.gradle | 4 +--- wallet/proguard-rules.pro | 11 +++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/wallet/build.gradle b/wallet/build.gradle index 76f909e..22fc0c8 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -54,13 +54,11 @@ android { } buildTypes { release { - // FIXME: walletcore only works when this is false minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } debug { - // FIXME: walletcore only works when this is false - minifyEnabled false + minifyEnabled minify_debug proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/wallet/proguard-rules.pro b/wallet/proguard-rules.pro index f08a431..733d3ea 100644 --- a/wallet/proguard-rules.pro +++ b/wallet/proguard-rules.pro @@ -20,10 +20,13 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile --keep class net.taler.akono.** {*;} - #noinspection ShrinkerUnresolvedReference -keep class net.taler.wallet.** {*;} +-keep interface net.taler.wallet.** {*;} --keep class com.sun.jna.** {*;} --keep class * implements com.sun.jna.** {*;} \ No newline at end of file +-dontwarn java.awt.* +-keep class com.sun.jna.* {*;} +-keepclassmembers class * extends com.sun.jna.* {public*;} +-keep,includedescriptorclasses class * { + native ; +} \ No newline at end of file -- cgit v1.2.3