From cf5081d300051b7c188ff39aacadad29d492900e Mon Sep 17 00:00:00 2001 From: unlnown542a Date: Sun, 7 Jan 2018 19:30:32 +0300 Subject: [PATCH] fixed creating certificates.zip when target zip did not include the directory certificates, so they were bein unpacked into datadir. Added entryCompression ZipEntryCompression.STORED since final APK is being compressed as well. Put all custom tasks under android plugin definitions --- android/build.gradle | 22 ++++++++++++---------- android/gradle.properties | 1 + 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 android/gradle.properties diff --git a/android/build.gradle b/android/build.gradle index fb2fe8c6..fcbb47ec 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,11 +8,6 @@ buildscript { } } -task clean(type: Delete,overwrite: true) { - delete 'build' - delete 'assets' -} - apply plugin: 'com.android.application' android { @@ -23,7 +18,7 @@ android { targetSdkVersion 25 minSdkVersion 14 versionCode 1 - versionName "2.17.2c" + versionName "2.17.2e" } sourceSets { main { @@ -51,10 +46,17 @@ android { } } -task zipCerts(type: Zip) { - archiveName 'certificates.zip' +task zipCerts(type:Zip) { + from (files('../contrib/')) + include 'certificates/**/*.crt' destinationDir file('assets') - from (files('../contrib/certificates')) + archiveName 'certificates.zip' + entryCompression ZipEntryCompression.STORED } - preBuild.dependsOn zipCerts + +task clean(type: Delete,overwrite: true) { + delete 'build' + delete 'assets' +} + diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 00000000..e32ec00b --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8