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
cb3c2dd8
Commit
cb3c2dd8
authored
Nov 01, 2017
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dependencies' into layout/authentication-screens
parents
2438f2fe
d9bdeb41
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
build.gradle
app/build.gradle
+4
-1
build.gradle
build.gradle
+1
-1
dependencies.gradle
dependencies.gradle
+3
-2
No files found.
app/build.gradle
View file @
cb3c2dd8
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 @
cb3c2dd8
...
@@ -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 @
cb3c2dd8
...
@@ -5,7 +5,7 @@ ext {
...
@@ -5,7 +5,7 @@ ext {
java
:
JavaVersion
.
VERSION_1_8
,
java
:
JavaVersion
.
VERSION_1_8
,
compileSdk
:
26
,
compileSdk
:
26
,
targetSdk
:
26
,
targetSdk
:
26
,
buildTools
:
'26.0.
1
'
,
buildTools
:
'26.0.
2
'
,
kotlin
:
'1.1.51'
,
kotlin
:
'1.1.51'
,
// Main dependencies
// Main dependencies
support
:
'26.1.0'
,
support
:
'26.1.0'
,
...
@@ -32,6 +32,7 @@ ext {
...
@@ -32,6 +32,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}"
,
...
@@ -56,4 +57,4 @@ ext {
...
@@ -56,4 +57,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