Commit aeb928ad authored by Lucio Maciel's avatar Lucio Maciel

Merge branch 'sdk-as-jars' into filipedelimabrito-feature/show-chat-list-using-sdk

parents 47976797 56690663
...@@ -76,8 +76,9 @@ cd $SDK_DIR && ./gradlew core:assemble && cd $CURRENT_DIR ...@@ -76,8 +76,9 @@ cd $SDK_DIR && ./gradlew core:assemble && cd $CURRENT_DIR
rm $CURRENT_DIR/libs/common* $CURRENT_DIR/libs/core* rm $CURRENT_DIR/libs/common* $CURRENT_DIR/libs/core*
cp $SDK_DIR/common/build/libs/common-0.1-SNAPSHOT.jar $CURRENT_DIR/libs/common-$SHA.jar mkdir -p $CURRENT_DIR/libs/
cp $SDK_DIR/core/build/libs/core-0.1-SNAPSHOT.jar $CURRENT_DIR/libs/core-$SHA.jar cp -v $SDK_DIR/common/build/libs/common-0.1-SNAPSHOT.jar $CURRENT_DIR/libs/common-$SHA.jar
cp -v $SDK_DIR/core/build/libs/core-0.1-SNAPSHOT.jar $CURRENT_DIR/libs/core-$SHA.jar
echo "$SHA" > $SDK_DIR/.last_commit_hash echo "$SHA" > $SDK_DIR/.last_commit_hash
......
...@@ -14,7 +14,7 @@ android { ...@@ -14,7 +14,7 @@ android {
versionCode 1 versionCode 1
versionName "2.0.0-beta1" versionName "2.0.0-beta1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled false multiDexEnabled true
} }
buildTypes { buildTypes {
......
...@@ -10,7 +10,7 @@ machine: ...@@ -10,7 +10,7 @@ machine:
GRADLE_OPTS: '-Xmx1024m -Dorg.gradle.jvmargs="-Xmx1024m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"' GRADLE_OPTS: '-Xmx1024m -Dorg.gradle.jvmargs="-Xmx1024m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
JAVA_OPTS: "-Xms518m -Xmx1024m" JAVA_OPTS: "-Xms518m -Xmx1024m"
pre: pre:
- git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git Rocket.Chat.Kotlin.Sdk - git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git Rocket.Chat.Kotlin.SDK
dependencies: dependencies:
pre: pre:
......
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