From 2f3ace38d0f5f1e7044841f6ecbad6749be681a6 Mon Sep 17 00:00:00 2001 From: Sandra Forberger Date: Tue, 19 Nov 2019 16:42:13 +0700 Subject: [PATCH 1/4] fix[android]: change xmx for gradle daemons to 1GB --- android/KMAPro/gradlew | 2 +- android/KMAPro/gradlew.bat | 2 +- android/KMEA/gradlew | 2 +- android/KMEA/gradlew.bat | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/KMAPro/gradlew b/android/KMAPro/gradlew index 91a7e269e1..7d19d8023b 100755 --- a/android/KMAPro/gradlew +++ b/android/KMAPro/gradlew @@ -7,7 +7,7 @@ ############################################################################## # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS="-Dorg.gradle.jvmargs=-Xmx1024m" APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` diff --git a/android/KMAPro/gradlew.bat b/android/KMAPro/gradlew.bat index 8a0b282aa6..6f22a1dbc6 100644 --- a/android/KMAPro/gradlew.bat +++ b/android/KMAPro/gradlew.bat @@ -9,7 +9,7 @@ if "%OS%"=="Windows_NT" setlocal @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Dorg.gradle.jvmargs=-Xmx1024m" set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. diff --git a/android/KMEA/gradlew b/android/KMEA/gradlew index 91a7e269e1..7d19d8023b 100755 --- a/android/KMEA/gradlew +++ b/android/KMEA/gradlew @@ -7,7 +7,7 @@ ############################################################################## # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS="-Dorg.gradle.jvmargs=-Xmx1024m" APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` diff --git a/android/KMEA/gradlew.bat b/android/KMEA/gradlew.bat index 8a0b282aa6..6f22a1dbc6 100644 --- a/android/KMEA/gradlew.bat +++ b/android/KMEA/gradlew.bat @@ -9,7 +9,7 @@ if "%OS%"=="Windows_NT" setlocal @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Dorg.gradle.jvmargs=-Xmx1024m" set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. From c96dc8c0013e6041983b80c86179a4ae33d9face Mon Sep 17 00:00:00 2001 From: Sandra Forberger Date: Tue, 19 Nov 2019 17:12:34 +0700 Subject: [PATCH 2/4] android[fix]: add memory vmargs to gradle properties --- android/KMAPro/gradlew | 2 +- android/KMAPro/gradlew.bat | 2 +- android/KMEA/gradle.properties | 2 ++ android/KMEA/gradlew | 2 +- android/KMEA/gradlew.bat | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/android/KMAPro/gradlew b/android/KMAPro/gradlew index 7d19d8023b..91a7e269e1 100755 --- a/android/KMAPro/gradlew +++ b/android/KMAPro/gradlew @@ -7,7 +7,7 @@ ############################################################################## # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="-Dorg.gradle.jvmargs=-Xmx1024m" +DEFAULT_JVM_OPTS="" APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` diff --git a/android/KMAPro/gradlew.bat b/android/KMAPro/gradlew.bat index 6f22a1dbc6..8a0b282aa6 100644 --- a/android/KMAPro/gradlew.bat +++ b/android/KMAPro/gradlew.bat @@ -9,7 +9,7 @@ if "%OS%"=="Windows_NT" setlocal @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Dorg.gradle.jvmargs=-Xmx1024m" +set DEFAULT_JVM_OPTS= set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. diff --git a/android/KMEA/gradle.properties b/android/KMEA/gradle.properties index dd9c757897..6d1b208c9b 100644 --- a/android/KMEA/gradle.properties +++ b/android/KMEA/gradle.properties @@ -9,3 +9,5 @@ android.enableUnitTestBinaryResources=true #WARNING: The option setting 'android.enableSeparateAnnotationProcessing=true' is experimental and unsupported. #The current default is 'false'. #android.enableSeparateAnnotationProcessing=true + +org.gradle.jvmargs=-Xmx1024m diff --git a/android/KMEA/gradlew b/android/KMEA/gradlew index 7d19d8023b..91a7e269e1 100755 --- a/android/KMEA/gradlew +++ b/android/KMEA/gradlew @@ -7,7 +7,7 @@ ############################################################################## # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="-Dorg.gradle.jvmargs=-Xmx1024m" +DEFAULT_JVM_OPTS="" APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` diff --git a/android/KMEA/gradlew.bat b/android/KMEA/gradlew.bat index 6f22a1dbc6..8a0b282aa6 100644 --- a/android/KMEA/gradlew.bat +++ b/android/KMEA/gradlew.bat @@ -9,7 +9,7 @@ if "%OS%"=="Windows_NT" setlocal @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Dorg.gradle.jvmargs=-Xmx1024m" +set DEFAULT_JVM_OPTS= set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. From 96e1d41aca04c12b2af8d8d9703e8baa72712f46 Mon Sep 17 00:00:00 2001 From: safolit <52272980+safolit@users.noreply.github.com> Date: Tue, 19 Nov 2019 17:39:31 +0700 Subject: [PATCH 3/4] Add memory vmargs --- android/KMAPro/gradle.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/KMAPro/gradle.properties b/android/KMAPro/gradle.properties index dbb7bf70d1..93aaf1410c 100644 --- a/android/KMAPro/gradle.properties +++ b/android/KMAPro/gradle.properties @@ -1,2 +1,4 @@ android.enableJetifier=true android.useAndroidX=true + +org.gradle.jvmargs=-Xmx1024m From b25382d5e9a3d4c0f94f828e0e2614e67c02d661 Mon Sep 17 00:00:00 2001 From: safolit <52272980+safolit@users.noreply.github.com> Date: Wed, 20 Nov 2019 09:14:56 +0700 Subject: [PATCH 4/4] Update history.md --- android/history.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/history.md b/android/history.md index 5165b8175c..428599c8f9 100644 --- a/android/history.md +++ b/android/history.md @@ -6,9 +6,11 @@ * Adding a download manager to execute downloads in background and cleanup the existing implementation (#2247, #2275, #2308) * Show spinner (without blocking UI), if user wants to add a language/keyboard and catalog download is in progress (#2313) * Improve custom package installation: Show readme.htm before starting installation process (#2286) + * Sanitize the app version to `#.#.#` for the API cloud query (#2319) +* Changes: * Update target Android SDK version to 29 (#2279) * Add linting to Debug builds and resolve lint errors (#2305) - * Sanitize the app version to `#.#.#` for the API cloud query (#2319) + * Fix memory issues during build process (#2361) ## 2019-10-30 12.0.4206 stable * Bug fix: