Skip to content
This repository has been archived by the owner on Oct 28, 2020. It is now read-only.

Commit

Permalink
Merged branch develop into master
Browse files Browse the repository at this point in the history
  • Loading branch information
derohimat committed Jan 25, 2017
2 parents c8eda50 + 2471877 commit 0e77d81
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ dependencies {

//----- Nine Olds Animation
compile 'com.nineoldandroids:library:2.4.0'

//----- Butterknife
compile 'com.jakewharton:butterknife:7.0.1'
//----- Logging
compile 'com.jakewharton.timber:timber:4.1.2'
compile 'com.jakewharton.timber:timber:4.5.1'
//----- Image Utils
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'de.hdodenhof:circleimageview:2.0.0'
compile 'de.hdodenhof:circleimageview:2.1.0'
//----- RecyclerView
compile 'com.jcodecraeer:xrecyclerview:1.2.7'
compile 'com.jcodecraeer:xrecyclerview:1.3.2'
}
4 changes: 2 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ dependencies {
compile "com.squareup.okhttp3:logging-interceptor:$OKHTTP_VERSION"

//----- The core of Reactive Programming
compile 'io.reactivex:rxjava:1.1.9'
compile 'io.reactivex:rxjava:1.2.5'
compile 'io.reactivex:rxandroid:1.2.1'

//----- Eventbuss
compile 'org.greenrobot:eventbus:3.0.0'

//----- Easy Permission Management
compile "com.karumi:dexter:2.2.2"
compile "com.karumi:dexter:3.0.0"

//----- Testing
testCompile 'junit:junit:4.12'
Expand Down

0 comments on commit 0e77d81

Please sign in to comment.