Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
a5a1b76b
Unverified
Commit
a5a1b76b
authored
Nov 13, 2017
by
Filipe de Lima Brito
Committed by
GitHub
Nov 13, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2 from RocketChat/chore/config
Update compileSdk, targetSdk and built-tools/support
parents
d9bdeb41
f5416b92
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
circle.yml
circle.yml
+9
-4
dependencies.gradle
dependencies.gradle
+5
-4
No files found.
circle.yml
View file @
a5a1b76b
...
@@ -7,10 +7,15 @@
...
@@ -7,10 +7,15 @@
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
-Xmx1024m"
dependencies
:
dependencies
:
pre
:
pre
:
-
sudo service mysql stop; sleep 5
-
sudo service mongod stop; sleep 5
-
sudo killall postgres; sleep 5
-
git fetch --tags
-
git fetch --tags
-
echo "sdk.dir="$ANDROID_HOME > local.properties
-
echo "sdk.dir="$ANDROID_HOME > local.properties
...
@@ -23,13 +28,13 @@ dependencies:
...
@@ -23,13 +28,13 @@ dependencies:
-
echo $API_KEY_STRINGS_BASE64 | base64 --decode > app/src/release/res/values/api_key_strings.xml
-
echo $API_KEY_STRINGS_BASE64 | base64 --decode > app/src/release/res/values/api_key_strings.xml
-
echo y | android update sdk --no-ui --all --filter tools,platform-tools
-
echo y | android update sdk --no-ui --all --filter tools,platform-tools
-
echo y | android update sdk --no-ui --all --filter android-2
6
-
echo y | android update sdk --no-ui --all --filter android-2
7
-
echo y | android update sdk --no-ui --all --filter extra-android-m2repository,extra-android-support
-
echo y | android update sdk --no-ui --all --filter extra-android-m2repository,extra-android-support
-
echo y | android update sdk --no-ui --all --filter extra-google-m2repository,extra-google-google_play_services
-
echo y | android update sdk --no-ui --all --filter extra-google-m2repository,extra-google-google_play_services
-
echo y | android update sdk --no-ui --all --filter build-tools-2
6
.0.0
-
echo y | android update sdk --no-ui --all --filter build-tools-2
7
.0.0
cache_directories
:
cache_directories
:
-
/usr/local/android-sdk-linux/tools
-
/usr/local/android-sdk-linux/tools
-
/usr/local/android-sdk-linux/build-tools/2
6
.0.0
-
/usr/local/android-sdk-linux/build-tools/2
7
.0.0
test
:
test
:
override
:
override
:
...
...
dependencies.gradle
View file @
a5a1b76b
...
@@ -3,12 +3,13 @@ import org.gradle.internal.jvm.Jvm
...
@@ -3,12 +3,13 @@ import org.gradle.internal.jvm.Jvm
ext
{
ext
{
versions
=
[
versions
=
[
java
:
JavaVersion
.
VERSION_1_8
,
java
:
JavaVersion
.
VERSION_1_8
,
compileSdk
:
2
6
,
compileSdk
:
2
7
,
targetSdk
:
2
6
,
targetSdk
:
2
7
,
buildTools
:
'2
6.0.2
'
,
buildTools
:
'2
7.0.0
'
,
kotlin
:
'1.1.51'
,
kotlin
:
'1.1.51'
,
// Main dependencies
// Main dependencies
support
:
'2
6.1
.0'
,
support
:
'2
7.0
.0'
,
constraintLayout
:
'1.0.2'
,
constraintLayout
:
'1.0.2'
,
autoValue
:
'1.3'
,
autoValue
:
'1.3'
,
moshi
:
'1.5.0'
,
moshi
:
'1.5.0'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment