From c8d94a704d211e1c9265e94c2a56bdd2414719cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 16 Aug 2023 17:14:22 +0200 Subject: [PATCH] Set kotlin version to 1.8.22 Imgly library does not seem to work correctly with kotlin version 1.9.0 --- app/build.gradle | 4 +++- app/src/main/AndroidManifest.xml | 1 - app/src/proprietary/AndroidManifest.xml | 1 - build.gradle | 2 +- gradle.properties | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 840cd5f36..5e3817b17 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,9 @@ android { } packagingOptions { - exclude 'META-INF/library_release.kotlin_module' + resources { + excludes += ['META-INF/library_release.kotlin_module'] + } } buildFeatures { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0bb618c7d..717f36d84 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ diff --git a/app/src/proprietary/AndroidManifest.xml b/app/src/proprietary/AndroidManifest.xml index 965ff4d64..de6150c08 100644 --- a/app/src/proprietary/AndroidManifest.xml +++ b/app/src/proprietary/AndroidManifest.xml @@ -1,6 +1,5 @@ task.contains("Proprietary") } repositories { diff --git a/gradle.properties b/gradle.properties index 1b66d5d35..9a656f4f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ android.enableJetifier=true +android.nonTransitiveRClass=true android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m -android.nonTransitiveRClass=true