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
d643cb6e
Unverified
Commit
d643cb6e
authored
Nov 13, 2017
by
Leonardo Aramaki
Committed by
GitHub
Nov 13, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dependencies' into chore/config
parents
2c9e5cc1
d9bdeb41
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
build.gradle
app/build.gradle
+4
-1
build.gradle
build.gradle
+1
-1
dependencies.gradle
dependencies.gradle
+2
-1
No files found.
app/build.gradle
View file @
d643cb6e
apply
plugin:
'com.android.application'
apply
plugin:
'com.android.application'
apply
plugin:
'kotlin-android'
apply
plugin:
'kotlin-android'
apply
plugin:
'kotlin-android-extensions'
apply
plugin:
'kotlin-kapt'
apply
plugin:
'kotlin-kapt'
android
{
android
{
...
@@ -27,6 +28,7 @@ dependencies {
...
@@ -27,6 +28,7 @@ dependencies {
implementation
libraries
.
appCompat
implementation
libraries
.
appCompat
implementation
libraries
.
recyclerview
implementation
libraries
.
recyclerview
implementation
libraries
.
design
implementation
libraries
.
design
implementation
libraries
.
constraintLayout
implementation
libraries
.
rxjava
implementation
libraries
.
rxjava
implementation
libraries
.
rxandroid
implementation
libraries
.
rxandroid
...
@@ -52,6 +54,7 @@ dependencies {
...
@@ -52,6 +54,7 @@ dependencies {
exclude
group:
'com.android.support'
,
module:
'support-annotations'
exclude
group:
'com.android.support'
,
module:
'support-annotations'
})
})
}
}
repositories
{
repositories
{
mavenCentral
()
mavenCentral
()
}
}
\ No newline at end of file
build.gradle
View file @
d643cb6e
...
@@ -7,7 +7,7 @@ buildscript {
...
@@ -7,7 +7,7 @@ buildscript {
jcenter
()
jcenter
()
}
}
dependencies
{
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}"
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
...
...
dependencies.gradle
View file @
d643cb6e
...
@@ -33,6 +33,7 @@ ext {
...
@@ -33,6 +33,7 @@ ext {
annotations
:
"com.android.support:support-annotations:${versions.support}"
,
annotations
:
"com.android.support:support-annotations:${versions.support}"
,
recyclerview
:
"com.android.support:recyclerview-v7:${versions.support}"
,
recyclerview
:
"com.android.support:recyclerview-v7:${versions.support}"
,
design
:
"com.android.support:design:${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}"
,
autoValue
:
"com.google.auto.value:auto-value:${versions.autoValue}"
,
moshi
:
"com.squareup.moshi:moshi:${versions.moshi}"
,
moshi
:
"com.squareup.moshi:moshi:${versions.moshi}"
,
dagger
:
"com.google.dagger:dagger:${versions.dagger}"
,
dagger
:
"com.google.dagger:dagger:${versions.dagger}"
,
...
@@ -57,4 +58,4 @@ ext {
...
@@ -57,4 +58,4 @@ ext {
roomTest
:
"android.arch.persistence.room:testing:${versions.room}"
,
roomTest
:
"android.arch.persistence.room:testing:${versions.room}"
,
expressoCore
:
"com.android.support.test.espresso:espresso-core:${versions.expresso}"
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