From f5a7820991cbe1b3b901e10cb603a96f2e238c56 Mon Sep 17 00:00:00 2001 From: Marton Kiss Date: Sat, 11 Jan 2025 12:37:55 +0100 Subject: [PATCH] fixed android building --- refilc/android/app/build.gradle | 18 ++++++++++++------ refilc/android/app/proguard-rules.pro | 5 ++++- refilc/android/gradle.properties | 1 + 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/refilc/android/app/build.gradle b/refilc/android/app/build.gradle index 8742755..ed64cee 100644 --- a/refilc/android/app/build.gradle +++ b/refilc/android/app/build.gradle @@ -69,13 +69,19 @@ android { } compileOptions { - // Flag to enable support for the new language APIs - coreLibraryDesugaringEnabled true - // Sets Java compatibility to Java 8 - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + // Flag to enable support for the new language APIs + coreLibraryDesugaringEnabled true + // Sets Java compatibility to Java 8 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + // sourceCompatibility JavaVersion.VERSION_21 + // targetCompatibility JavaVersion.VERSION_21 } + // kotlinOptions { + // jvmTarget = JavaVersion.VERSION_1_8 + // } + signingConfigs { debug { keyAlias "androiddebugkey" @@ -119,7 +125,7 @@ dependencies { implementation 'joda-time:joda-time:2.9.4' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3' implementation 'androidx.window:window:1.0.0' implementation 'androidx.window:window-java:1.0.0' } diff --git a/refilc/android/app/proguard-rules.pro b/refilc/android/app/proguard-rules.pro index 2f9ff85..31bcfd1 100644 --- a/refilc/android/app/proguard-rules.pro +++ b/refilc/android/app/proguard-rules.pro @@ -8,4 +8,7 @@ -dontwarn com.stripe.android.pushProvisioning.PushProvisioningActivityStarter$Args -dontwarn com.stripe.android.pushProvisioning.PushProvisioningActivityStarter$Error -dontwarn com.stripe.android.pushProvisioning.PushProvisioningActivityStarter --dontwarn com.stripe.android.pushProvisioning.PushProvisioningEphemeralKeyProvider \ No newline at end of file +-dontwarn com.stripe.android.pushProvisioning.PushProvisioningEphemeralKeyProvider + +-dontwarn org.joda.convert.FromString +-dontwarn org.joda.convert.ToString \ No newline at end of file diff --git a/refilc/android/gradle.properties b/refilc/android/gradle.properties index 80db790..62db1c9 100644 --- a/refilc/android/gradle.properties +++ b/refilc/android/gradle.properties @@ -6,3 +6,4 @@ org.gradle.jvmargs=-Xmx1536M \ --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED android.useAndroidX=true android.enableJetifier=true +kotlin.jvm.target.validation.mode=IGNORE \ No newline at end of file