From a8fe1b20ff5a3a7a98851d21cd7aa4396706ed72 Mon Sep 17 00:00:00 2001 From: Arne Date: Sun, 23 Jan 2022 16:58:14 +0100 Subject: [PATCH] update gradle files (Christian Schneppe) --- build.gradle | 8 ++++---- gradle.properties | 20 +++++++++++++++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 5c2f06f5c..20bfd76a9 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.0.4' } } @@ -59,7 +59,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.6' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.legacy:legacy-support-v13:1.0.0' - implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.appcompat:appcompat:1.3.1' // 1.4.0 needs minCompileSdk 31 implementation 'androidx.exifinterface:exifinterface:1.3.3' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.emoji:emoji:1.1.0' @@ -76,7 +76,7 @@ dependencies { implementation 'org.jxmpp:jxmpp-jid:1.0.2' implementation 'org.hsluv:hsluv:0.2' implementation 'org.conscrypt:conscrypt-android:2.5.2' - implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.23' + implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24' implementation 'me.drakeet.support:toastcompat:1.1.0' implementation 'org.osmdroid:osmdroid-android:6.1.11' implementation 'com.leinardi.android:speed-dial:3.2.0' @@ -86,7 +86,7 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'com.google.guava:guava:31.0.1-android' implementation 'com.github.AppIntro:AppIntro:6.1.0' - implementation 'androidx.browser:browser:1.3.0' + implementation 'androidx.browser:browser:1.3.0' // 1.4.0 needs minCompileSdk 31 implementation 'com.otaliastudios:transcoder:0.9.1' // 0.10.4 seems to be buggy implementation fileTree(include: ['libwebrtc-m92.aar'], dir: 'libs') } diff --git a/gradle.properties b/gradle.properties index 3684e5f26..7f0c18681 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,18 @@ -android.enableJetifier=true -android.useAndroidX=true -org.gradle.jvmargs=-Xmx4096M + +## For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +#Sat Jan 22 19:25:52 CET 2022 org.gradle.parallel=true +org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M" +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file