Skip to content

A
AloqaIM-Android
Unverified Commit e5198165 authored by Leonardo Aramaki's avatar Leonardo Aramaki Committed by GitHub
Browse files
Options

Merge pull request #555 from RocketChat/chore/bump_version_46 

Bump app version to 46
parents 8cf95931 dbe0eb9f
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
app/build.gradle
View file @ e5198165
...@@ -20,8 +20,8 @@ android { ...@@ -20,8 +20,8 @@ android {
applicationId "chat.rocket.android" applicationId "chat.rocket.android"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 45 versionCode 46
versionName "1.0.23" versionName "1.0.24"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
multiDexEnabled true multiDexEnabled true
......
circle.yml
View file @ e5198165
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
machine: machine:
environment: environment:
ANDROID_HOME: /usr/local/android-sdk-linux ANDROID_HOME: /usr/local/android-sdk-linux
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"' GRADLE_OPTS: '-Xmx1024m -Dorg.gradle.jvmargs="-Xmx1024m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
JAVA_OPTS: "-Xms518m -Xmx1536m" JAVA_OPTS: "-Xms518m -Xmx1536m"
dependencies: dependencies:
......
gradle.properties
View file @ e5198165
...@@ -15,3 +15,4 @@ ...@@ -15,3 +15,4 @@
org.gradle.jvmargs=-Xmx6144M org.gradle.jvmargs=-Xmx6144M
#org.gradle.parallel=true #org.gradle.parallel=true
android.enableBuildCache=true android.enableBuildCache=true
android.enableAapt2=false
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023