Bump Android build number to 135 (#2062)

* Increase gradle jvm memory

* Fix Android release build

* Bump Android build number to 135
This commit is contained in:
Elias Nahum 2018-08-31 00:20:24 -03:00 committed by GitHub
parent 81e46c9140
commit 4b32918c1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 11 deletions

View file

@ -113,8 +113,9 @@ android {
applicationId "com.mattermost.rnbeta"
minSdkVersion 21
targetSdkVersion 26
versionCode 134
versionCode 135
versionName "1.12.0"
multiDexEnabled = true
ndk {
abiFilters "armeabi-v7a", "x86"
}
@ -187,15 +188,9 @@ configurations.all {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation ("com.android.support:appcompat-v7:26.1.0") {
force = true;
}
implementation ('com.android.support:design:26.1.0') {
force = true;
}
implementation ('com.android.support:percent:26.1.0') {
force = true;
}
implementation "com.android.support:appcompat-v7:27.1.1"
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:percent:27.1.1'
implementation "com.facebook.react:react-native:+" // From node_modules
implementation project(':react-native-document-picker')
implementation project(':react-native-keychain')

View file

@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.google.gms:google-services:3.1.0'
classpath 'com.google.gms:google-services:3.2.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

View file

@ -11,6 +11,7 @@
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048M
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit