Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
b5317687
Commit
b5317687
authored
7 years ago
by
Pierre Duchemin
Browse files
Options
Downloads
Patches
Plain Diff
Update dependencies
Change-Id: I6f453dfcd75e9f1db77a5c59a5ee98c0b28bd978
parent
19b1e32b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ring-android/app/build.gradle
+22
-19
22 additions, 19 deletions
ring-android/app/build.gradle
ring-android/app/proguard-rules.pro
+12
-1
12 additions, 1 deletion
ring-android/app/proguard-rules.pro
ring-android/libringclient/build.gradle
+2
-2
2 additions, 2 deletions
ring-android/libringclient/build.gradle
with
36 additions
and
22 deletions
ring-android/app/build.gradle
+
22
−
19
View file @
b5317687
apply
plugin:
'com.android.application'
def
android_support_version
=
"27.0.0"
def
android_support_version
=
"27.0.2"
def
butterknife_version
=
"8.8.1"
def
dagger_version
=
"2.12"
dependencies
{
co
mp
i
le
fileTree
(
include:
'*.jar'
,
dir:
'libs'
)
co
mp
i
le
project
(
':libringclient'
)
i
mple
mentation
fileTree
(
include:
'*.jar'
,
dir:
'libs'
)
i
mple
mentation
project
(
':libringclient'
)
co
mp
i
le
"com.android.support:support-v13:$android_support_version"
co
mp
i
le
"com.android.support:design:$android_support_version"
co
mp
i
le
"com.android.support:cardview-v7:$android_support_version"
co
mp
i
le
"com.android.support:preference-v14:$android_support_version"
co
mp
i
le
"com.android.support:recyclerview-v7:$android_support_version"
co
mp
i
le
"com.android.support:appcompat-v7:$android_support_version"
co
mp
i
le
"com.android.support:leanback-v17:$android_support_version"
i
mple
mentation
"com.android.support:support-v13:$android_support_version"
i
mple
mentation
"com.android.support:design:$android_support_version"
i
mple
mentation
"com.android.support:cardview-v7:$android_support_version"
i
mple
mentation
"com.android.support:preference-v14:$android_support_version"
i
mple
mentation
"com.android.support:recyclerview-v7:$android_support_version"
i
mple
mentation
"com.android.support:appcompat-v7:$android_support_version"
i
mple
mentation
"com.android.support:leanback-v17:$android_support_version"
// ORM
co
mp
i
le
'com.j256.ormlite:ormlite-android:4.48'
i
mple
mentation
'com.j256.ormlite:ormlite-android:4.48'
// Barcode scanning
co
mp
i
le
'com.journeyapps:zxing-android-embedded:3.5.0@aar'
i
mple
mentation
'com.journeyapps:zxing-android-embedded:3.5.0@aar'
// Butterknife
compile
'com.jakewharton:butterknife:8.6.0'
compile
'com.skyfishjy.ripplebackground:library:1.0.1'
annotationProcessor
'com.jakewharton:butterknife-compiler:8.6.0'
implementation
"com.jakewharton:butterknife:$butterknife_version"
annotationProcessor
"com.jakewharton:butterknife-compiler:$butterknife_version"
implementation
'com.skyfishjy.ripplebackground:library:1.0.1'
// Dagger dependency injection
annotationProcessor
'
com.google.dagger:dagger
-compiler:2.12'
compile
'
com.google.dagger:dagger
:2.12'
compile
"
com.google.dagger:dagger
:$dagger_version"
annotationProcessor
"
com.google.dagger:dagger
-compiler:$dagger_version"
provided
'javax.annotation:jsr250-api:1.0'
// Glide
co
mp
i
le
'com.github.bumptech.glide:glide:3.8.0'
i
mple
mentation
'com.github.bumptech.glide:glide:3.8.0'
// RxAndroid
co
mp
i
le
'io.reactivex.rxjava2:rxandroid:2.0.1'
i
mple
mentation
'io.reactivex.rxjava2:rxandroid:2.0.1'
}
android
{
...
...
This diff is collapsed.
Click to expand it.
ring-android/app/proguard-rules.pro
+
12
−
1
View file @
b5317687
...
...
@@ -44,4 +44,15 @@
-
keepclassmembers
class
com
.
journeyapps
.
barcodescanner
.
**
{
*
;
}
-
keep
,
includedescriptorclasses
class
se
.
emilsjolander
.
stickylistheaders
.
**
{
*
;
}
-
keepclassmembers
class
se
.
emilsjolander
.
stickylistheaders
.
**
{
*
;
}
\ No newline at end of file
-
keepclassmembers
class
se
.
emilsjolander
.
stickylistheaders
.
**
{
*
;
}
-
keep
class
butterknife
.
**
{
*
;
}
-
dontwarn
butterknife
.
**
-
dontwarn
butterknife
.
internal
.
**
-
keep
class
**
$$
ViewBinder
{
*
;
}
-
keepclasseswithmembernames
class
*
{
@
butterknife
.
*
<
fields
>
;
}
-
keepclasseswithmembernames
class
*
{
@
butterknife
.
*
<
methods
>
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
ring-android/libringclient/build.gradle
+
2
−
2
View file @
b5317687
...
...
@@ -12,7 +12,7 @@ dependencies {
}
// QRCode encoding
compile
'com.google.zxing:core:3.3.
0
'
compile
'com.google.zxing:core:3.3.
1
'
// dependency injection
compile
'javax.inject:javax.inject:1'
...
...
@@ -24,7 +24,7 @@ dependencies {
testCompile
'junit:junit:4.12'
// RxJava
compile
"io.reactivex.rxjava2:rxjava:2.1.
5
"
compile
"io.reactivex.rxjava2:rxjava:2.1.
8
"
}
sourceCompatibility
=
"1.7"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment