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
f57f4e6e
Unverified
Commit
f57f4e6e
authored
Nov 13, 2017
by
Leonardo Aramaki
Committed by
GitHub
Nov 13, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #546 from filipedelimabrito/dependencies
[CHORE] Update and add dependencies
parents
b9debb72
a5a1b76b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
11 deletions
+21
-11
build.gradle
app/build.gradle
+4
-1
build.gradle
build.gradle
+1
-1
circle.yml
circle.yml
+9
-4
dependencies.gradle
dependencies.gradle
+7
-5
No files found.
app/build.gradle
View file @
f57f4e6e
apply
plugin:
'com.android.application'
apply
plugin:
'kotlin-android'
apply
plugin:
'kotlin-android-extensions'
apply
plugin:
'kotlin-kapt'
android
{
...
...
@@ -27,6 +28,7 @@ dependencies {
implementation
libraries
.
appCompat
implementation
libraries
.
recyclerview
implementation
libraries
.
design
implementation
libraries
.
constraintLayout
implementation
libraries
.
rxjava
implementation
libraries
.
rxandroid
...
...
@@ -52,6 +54,7 @@ dependencies {
exclude
group:
'com.android.support'
,
module:
'support-annotations'
})
}
repositories
{
mavenCentral
()
}
}
\ No newline at end of file
build.gradle
View file @
f57f4e6e
...
...
@@ -7,7 +7,7 @@ buildscript {
jcenter
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:3.0.0
-beta6
'
classpath
'com.android.tools.build:gradle:3.0.0'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
// NOTE: Do not place your application dependencies here; they belong
...
...
circle.yml
View file @
f57f4e6e
...
...
@@ -7,10 +7,15 @@
machine
:
environment
:
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
:
pre
:
-
sudo service mysql stop; sleep 5
-
sudo service mongod stop; sleep 5
-
sudo killall postgres; sleep 5
-
git fetch --tags
-
echo "sdk.dir="$ANDROID_HOME > local.properties
...
...
@@ -23,13 +28,13 @@ dependencies:
-
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 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-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
:
-
/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
:
override
:
...
...
dependencies.gradle
View file @
f57f4e6e
...
...
@@ -3,12 +3,13 @@ import org.gradle.internal.jvm.Jvm
ext
{
versions
=
[
java
:
JavaVersion
.
VERSION_1_8
,
compileSdk
:
2
6
,
targetSdk
:
2
6
,
buildTools
:
'2
6.0.1
'
,
compileSdk
:
2
7
,
targetSdk
:
2
7
,
buildTools
:
'2
7.0.0
'
,
kotlin
:
'1.1.51'
,
// Main dependencies
support
:
'2
6.1
.0'
,
support
:
'2
7.0
.0'
,
constraintLayout
:
'1.0.2'
,
autoValue
:
'1.3'
,
moshi
:
'1.5.0'
,
...
...
@@ -32,6 +33,7 @@ ext {
annotations
:
"com.android.support:support-annotations:${versions.support}"
,
recyclerview
:
"com.android.support:recyclerview-v7:${versions.support}"
,
design
:
"com.android.support:design:${versions.support}"
,
constraintLayout
:
"com.android.support.constraint:constraint-layout:${versions.constraintLayout}"
,
autoValue
:
"com.google.auto.value:auto-value:${versions.autoValue}"
,
moshi
:
"com.squareup.moshi:moshi:${versions.moshi}"
,
dagger
:
"com.google.dagger:dagger:${versions.dagger}"
,
...
...
@@ -56,4 +58,4 @@ ext {
roomTest
:
"android.arch.persistence.room:testing:${versions.room}"
,
expressoCore
:
"com.android.support.test.espresso:espresso-core:${versions.expresso}"
]
}
}
\ No newline at end of file
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