Merge remote-tracking branch 'origin/master' into create_custom_poi

This commit is contained in:
veliymolfar 2020-04-23 17:44:04 +03:00
commit 2e7947589c

View file

@ -52,7 +52,7 @@ android {
versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
// Stops the Gradle plugins automatic rasterization of vectors // Stops the Gradle plugins automatic rasterization of vectors
generatedDensities = [] // generatedDensities = []
} }
lintOptions { lintOptions {
@ -84,7 +84,7 @@ android {
noCompress "qz" noCompress "qz"
cruncherEnabled = false cruncherEnabled = false
// Flag notifies aapt to keep the attribute IDs around // Flag notifies aapt to keep the attribute IDs around
additionalParameters "--no-version-vectors" // additionalParameters "--no-version-vectors"
} }
dexOptions { dexOptions {