Skip to content

Commit 9ec1a6d

Browse files
authored
Merge pull request #92 from miguelbcr/deprecated-exif-interface
Deprecated exif interface
2 parents f377dc7 + dcab532 commit 9ec1a6d

7 files changed

Lines changed: 32 additions & 24 deletions

File tree

app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ buildscript {
1111
}
1212

1313
android {
14-
compileSdkVersion 26
15-
buildToolsVersion '26.0.2'
14+
compileSdkVersion 27
15+
buildToolsVersion '27.0.3'
1616

1717
defaultConfig {
1818
applicationId "com.miguelbcr.ui.rx_paparazzo2.sample"
1919
minSdkVersion 16
20-
targetSdkVersion 26
20+
targetSdkVersion 27
2121
versionCode 1
2222
versionName "1.0"
2323
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -40,14 +40,14 @@ android {
4040
dependencies {
4141
compile fileTree(include: ['*.jar'], dir: 'libs')
4242
testCompile 'junit:junit:4.12'
43-
compile 'com.android.support:appcompat-v7:26.1.0'
44-
compile 'com.android.support:design:26.1.0'
45-
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
43+
compile 'com.android.support:appcompat-v7:27.1.1'
44+
compile 'com.android.support:design:27.1.1'
45+
compile 'io.reactivex.rxjava2:rxandroid:2.0.2'
4646
compile 'com.squareup.picasso:picasso:2.5.2'
4747
compile project(':rx_paparazzo')
4848

49-
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
50-
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
49+
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.6.1'
50+
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.1'
5151

5252
androidTestCompile 'com.github.VictorAlbertos:DeviceAnimationTestRule:0.0.2'
5353

build.gradle

Lines changed: 1 addition & 1 deletion
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'
9+
classpath 'com.android.tools.build:gradle:3.1.3'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Nov 11 11:39:57 CET 2017
1+
#Sat Aug 25 10:01:38 CEST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

rx_paparazzo/build.gradle

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ buildscript {
1414
}
1515

1616
android {
17-
compileSdkVersion 26
18-
buildToolsVersion '26.0.2'
17+
compileSdkVersion 27
18+
buildToolsVersion '27.0.3'
1919

2020
defaultConfig {
2121
minSdkVersion 16
22-
targetSdkVersion 26
22+
targetSdkVersion 27
2323
versionCode 1
2424
versionName "1.0"
2525
}
@@ -36,14 +36,21 @@ android {
3636

3737
dependencies {
3838
compile fileTree(dir: 'libs', include: ['*.jar'])
39-
compile "io.reactivex.rxjava2:rxjava:2.1.1"
39+
compile "io.reactivex.rxjava2:rxjava:2.1.16"
4040
compile "com.github.VictorAlbertos:RxActivityResult:0.4.5-2.x"
41-
compile 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.4@aar'
42-
compile 'com.github.yalantis:ucrop:2.2.1'
41+
compile 'com.github.tbruyelle:rxpermissions:0.10.2'
42+
compile 'com.github.yalantis:ucrop:2.2.2'
43+
compile 'com.android.support:exifinterface:27.1.1'
4344

4445
testCompile 'junit:junit:4.12'
4546
}
4647

48+
configurations.all {
49+
resolutionStrategy.force "com.android.support:exifinterface:27.1.1"
50+
resolutionStrategy.force "com.android.support:animated-vector-drawable:27.1.1"
51+
resolutionStrategy.force "com.android.support:appcompat-v7:27.1.1"
52+
}
53+
4754
// build a jar with source files
4855
task sourcesJar(type: Jar) {
4956
from android.sourceSets.main.java.srcDirs
@@ -81,4 +88,3 @@ install {
8188
}
8289
}
8390
}
84-

rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo2/entities/TargetUi.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package com.miguelbcr.ui.rx_paparazzo2.entities;
1818

19-
import android.app.Activity;
2019
import android.content.Context;
2120
import android.support.annotation.Nullable;
2221
import android.support.v4.app.Fragment;
22+
import android.support.v4.app.FragmentActivity;
2323

2424
public class TargetUi {
2525
private Object ui;
@@ -28,8 +28,8 @@ public TargetUi(Object ui) {
2828
this.ui = ui;
2929
}
3030

31-
public Activity activity() {
32-
return fragment() != null ? fragment().getActivity() : (Activity) ui;
31+
public FragmentActivity activity() {
32+
return fragment() != null ? fragment().getActivity() : (FragmentActivity) ui;
3333
}
3434

3535
@Nullable

rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo2/interactors/ImageUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import android.content.Context;
2121
import android.graphics.Bitmap;
2222
import android.graphics.BitmapFactory;
23-
import android.media.ExifInterface;
2423
import android.net.Uri;
2524
import android.os.Environment;
25+
import android.support.media.ExifInterface;
2626
import android.text.TextUtils;
2727
import android.util.Log;
2828
import android.webkit.MimeTypeMap;

rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo2/interactors/StartIntent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import android.app.Activity;
2020
import android.content.Intent;
2121
import android.support.v4.app.Fragment;
22+
import android.support.v4.app.FragmentActivity;
23+
2224
import com.miguelbcr.ui.rx_paparazzo2.entities.TargetUi;
2325
import com.miguelbcr.ui.rx_paparazzo2.entities.UserCanceledException;
2426
import io.reactivex.Observable;
@@ -61,8 +63,8 @@ StartIntent with(Intent intent, OnPreResult onPreResult) {
6163
} else {
6264
return RxActivityResult.on(targetUi.activity())
6365
.startIntent(intent, onPreResult)
64-
.map(new Function<Result<Activity>, Intent>() {
65-
@Override public Intent apply(Result<Activity> result) throws Exception {
66+
.map(new Function<Result<FragmentActivity>, Intent>() {
67+
@Override public Intent apply(Result<FragmentActivity> result) throws Exception {
6668
return StartIntent.this.getResponse(result);
6769
}
6870
});

0 commit comments

Comments
 (0)