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
8f8d9816
Commit
8f8d9816
authored
May 22, 2017
by
Rafael Kellermann Streit
Committed by
GitHub
May 22, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #294 from RocketChat/fix_284
Possible fix for 284
parents
0e331c30
0350676e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
build.gradle
android-ddp/build.gradle
+3
-3
build.gradle
app/build.gradle
+3
-1
No files found.
android-ddp/build.gradle
View file @
8f8d9816
...
...
@@ -7,7 +7,7 @@ buildscript {
}
dependencies
{
classpath
'com.android.tools.build:gradle:2.3.1'
classpath
'me.tatarka:gradle-retrolambda:3.
5.0
'
classpath
'me.tatarka:gradle-retrolambda:3.
6.1
'
classpath
'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
}
}
...
...
@@ -43,9 +43,9 @@ dependencies {
compile
"com.android.support:support-annotations:$supportVersion"
compile
'com.squareup.okhttp3:okhttp:3.
6
.0'
compile
'com.squareup.okhttp3:okhttp:3.
8
.0'
compile
'io.reactivex.rxjava2:rxjava:2.
0.6
'
compile
'io.reactivex.rxjava2:rxjava:2.
1.0
'
compile
'com.parse.bolts:bolts-tasks:1.4.0'
}
app/build.gradle
View file @
8f8d9816
...
...
@@ -34,7 +34,7 @@ android {
minSdkVersion
16
targetSdkVersion
25
versionCode
22
versionName
"1.0.1
2
"
versionName
"1.0.1
3
"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
vectorDrawables
.
useSupportLibrary
=
true
...
...
@@ -124,6 +124,8 @@ dependencies {
compile
"com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
annotationProcessor
"com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
compile
"com.android.support:support-annotations:$supportVersion"
}
apply
plugin:
'com.google.gms.google-services'
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