Skip to content

Commit 4a7d48d

Browse files
authored
Merge pull request #17 from ragdroid/dagger-android
update libraries
2 parents d4f1b5f + 134c622 commit 4a7d48d

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

app/build.gradle

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda'
33

44
android {
55
compileSdkVersion 26
6-
buildToolsVersion "26.0.1"
6+
buildToolsVersion '26.0.2'
77
defaultConfig {
88
applicationId "com.ragdroid.dahaka"
99
minSdkVersion 16
@@ -32,10 +32,11 @@ android {
3232

3333

3434
}
35-
final supportVersion = '26.0.1'
35+
final supportVersion = '26.1.0'
3636
final retrofitVersion = '2.3.0'
3737
final espressoVersion = '3.0.0'
38-
final daggerVersion = '2.11'
38+
final daggerVersion = '2.15'
39+
final okhttpVersion = '3.9.1'
3940

4041
dependencies {
4142
compile fileTree(dir: 'libs', include: ['*.jar'])
@@ -54,30 +55,29 @@ dependencies {
5455
annotationProcessor "com.google.dagger:dagger-android-processor:${daggerVersion}"
5556
annotationProcessor "com.google.dagger:dagger-compiler:${daggerVersion}"
5657

57-
compile 'com.squareup.okhttp3:logging-interceptor:3.7.0'
58-
compile 'com.squareup.okhttp3:okhttp:3.8.0'
59-
compile 'com.google.code.gson:gson:2.8.1'
58+
compile "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
59+
compile "com.squareup.okhttp3:okhttp:${okhttpVersion}"
6060

6161
compile "com.squareup.retrofit2:retrofit:${retrofitVersion}"
6262
compile "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
6363
compile "com.squareup.retrofit2:adapter-rxjava2:${retrofitVersion}"
6464

6565
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
6666

67-
compile 'com.github.bumptech.glide:glide:4.0.0'
68-
compile 'jp.wasabeef:glide-transformations:2.0.2'
67+
compile 'com.github.bumptech.glide:glide:4.3.1'
68+
compile 'jp.wasabeef:glide-transformations:3.0.1'
6969

7070

7171

7272
testCompile 'junit:junit:4.12'
7373

7474
provided 'javax.annotation:jsr250-api:1.0'
7575

76-
androidTestCompile "com.android.support.test:runner:1.0.0"
77-
androidTestCompile "com.android.support.test:rules:1.0.0"
76+
androidTestCompile "com.android.support.test:runner:1.0.1"
77+
androidTestCompile "com.android.support.test:rules:1.0.1"
7878
androidTestCompile "com.android.support.test.espresso:espresso-core:${espressoVersion}"
7979
androidTestCompile "com.android.support.test.espresso:espresso-intents:${espressoVersion}"
80-
androidTestCompile 'org.mockito:mockito-android:2.8.47'
81-
androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.11"
80+
androidTestCompile 'org.mockito:mockito-android:2.13.0'
81+
androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:${daggerVersion}"
8282

8383
}

app/src/main/java/com/ragdroid/dahaka/util/BindingAdapter.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.ragdroid.dahaka.util;
22

3-
import android.content.Context;
43
import android.databinding.BindingConversion;
54
import android.graphics.drawable.Drawable;
65
import android.view.View;
@@ -46,7 +45,6 @@ public BindingAdapter(RequestManager requestManager) {
4645
public void setImageUrl(ImageView view, String src, Drawable placeholder, Drawable error,
4746
int blurValue, boolean cropCircle) {
4847

49-
Context ctx = view.getContext();
5048
RequestOptions options = new RequestOptions();
5149

5250
RequestBuilder<Drawable> glideBuilder = requestManager.load(src);
@@ -61,7 +59,7 @@ public void setImageUrl(ImageView view, String src, Drawable placeholder, Drawab
6159
}
6260

6361
if (blurValue > 0) {
64-
options.transform(new BlurTransformation(ctx, blurValue));
62+
options.transform(new BlurTransformation(blurValue));
6563
}
6664

6765
if (cropCircle) {

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.0.0-beta6'
9+
classpath 'com.android.tools.build:gradle:3.1.0'
1010
classpath 'me.tatarka:gradle-retrolambda:3.7.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong

0 commit comments

Comments
 (0)