Merge pull request #1748 from NightlyNexus/eric.2018-02-28.exifinterface

Use support library's ExifInterface.
square · Feb 28, 2018 · 359710d · 359710d
2 parents 42e01c6 + cd8031d
commit 359710d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 26 deletions.
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -8,16 +8,17 @@ ext {
   supportLibrariesVersion = '27.1.0'
 
   dep = [
-      androidPlugin      : 'com.android.tools.build:gradle:3.0.1',
-      okhttp             : "com.squareup.okhttp3:okhttp:$okhttpVersion",
-      mockWebServer      : "com.squareup.okhttp3:mockwebserver:$okhttpVersion",
-      pollexor           : 'com.squareup:pollexor:2.0.4',
-      supportV4          : "com.android.support:support-v4:$supportLibrariesVersion",
-      supportAnnotations : "com.android.support:support-annotations:$supportLibrariesVersion",
-      junit              : 'junit:junit:4.12',
-      truth              : 'com.google.truth:truth:0.36',
-      robolectric        : 'org.robolectric:robolectric:3.1',
-      mockito            : 'org.mockito:mockito-core:1.9.5'
+      androidPlugin        : 'com.android.tools.build:gradle:3.0.1',
+      okhttp               : "com.squareup.okhttp3:okhttp:$okhttpVersion",
+      mockWebServer        : "com.squareup.okhttp3:mockwebserver:$okhttpVersion",
+      pollexor             : 'com.squareup:pollexor:2.0.4',
+      supportV4            : "com.android.support:support-v4:$supportLibrariesVersion",
+      supportAnnotations   : "com.android.support:support-annotations:$supportLibrariesVersion",
+      supportExifInterface : "com.android.support:exifinterface:$supportLibrariesVersion",
+      junit                : 'junit:junit:4.12',
+      truth                : 'com.google.truth:truth:0.36',
+      robolectric          : 'org.robolectric:robolectric:3.1',
+      mockito              : 'org.mockito:mockito-core:1.9.5'
   ]
 
   isCi = "true" == System.getenv('CI')

diff --git a/picasso/build.gradle b/picasso/build.gradle
@@ -33,7 +33,8 @@ android {
 
 dependencies {
   api dep.okhttp
-  compileOnly dep.supportAnnotations
+  api dep.supportAnnotations
+  implementation dep.supportExifInterface
   testImplementation dep.junit
   testImplementation dep.truth
   testImplementation dep.supportV4

diff --git a/picasso/src/main/java/com/squareup/picasso/BitmapHunter.java b/picasso/src/main/java/com/squareup/picasso/BitmapHunter.java
@@ -33,13 +33,13 @@
 import okio.Okio;
 import okio.Source;
 
-import static android.media.ExifInterface.ORIENTATION_FLIP_HORIZONTAL;
-import static android.media.ExifInterface.ORIENTATION_FLIP_VERTICAL;
-import static android.media.ExifInterface.ORIENTATION_ROTATE_180;
-import static android.media.ExifInterface.ORIENTATION_ROTATE_270;
-import static android.media.ExifInterface.ORIENTATION_ROTATE_90;
-import static android.media.ExifInterface.ORIENTATION_TRANSPOSE;
-import static android.media.ExifInterface.ORIENTATION_TRANSVERSE;
+import static android.support.media.ExifInterface.ORIENTATION_FLIP_HORIZONTAL;
+import static android.support.media.ExifInterface.ORIENTATION_FLIP_VERTICAL;
+import static android.support.media.ExifInterface.ORIENTATION_ROTATE_180;
+import static android.support.media.ExifInterface.ORIENTATION_ROTATE_270;
+import static android.support.media.ExifInterface.ORIENTATION_ROTATE_90;
+import static android.support.media.ExifInterface.ORIENTATION_TRANSPOSE;
+import static android.support.media.ExifInterface.ORIENTATION_TRANSVERSE;
 import static com.squareup.picasso.MemoryPolicy.shouldReadFromMemoryCache;
 import static com.squareup.picasso.Picasso.LoadedFrom.MEMORY;
 import static com.squareup.picasso.Picasso.Priority;

diff --git a/picasso/src/main/java/com/squareup/picasso/FileRequestHandler.java b/picasso/src/main/java/com/squareup/picasso/FileRequestHandler.java
@@ -16,15 +16,15 @@
 package com.squareup.picasso;
 
 import android.content.Context;
-import android.media.ExifInterface;
+import android.support.media.ExifInterface;
 import android.net.Uri;
 import java.io.IOException;
 import okio.Okio;
 import okio.Source;
 
 import static android.content.ContentResolver.SCHEME_FILE;
-import static android.media.ExifInterface.ORIENTATION_NORMAL;
-import static android.media.ExifInterface.TAG_ORIENTATION;
+import static android.support.media.ExifInterface.ORIENTATION_NORMAL;
+import static android.support.media.ExifInterface.TAG_ORIENTATION;
 import static com.squareup.picasso.Picasso.LoadedFrom.DISK;
 
 class FileRequestHandler extends ContentStreamRequestHandler {

diff --git a/picasso/src/test/java/com/squareup/picasso/BitmapHunterTest.java b/picasso/src/test/java/com/squareup/picasso/BitmapHunterTest.java
@@ -34,11 +34,11 @@
 import org.robolectric.shadows.ShadowMatrix;
 
 import static android.graphics.Bitmap.Config.ARGB_8888;
-import static android.media.ExifInterface.ORIENTATION_FLIP_HORIZONTAL;
-import static android.media.ExifInterface.ORIENTATION_FLIP_VERTICAL;
-import static android.media.ExifInterface.ORIENTATION_ROTATE_90;
-import static android.media.ExifInterface.ORIENTATION_TRANSPOSE;
-import static android.media.ExifInterface.ORIENTATION_TRANSVERSE;
+import static android.support.media.ExifInterface.ORIENTATION_FLIP_HORIZONTAL;
+import static android.support.media.ExifInterface.ORIENTATION_FLIP_VERTICAL;
+import static android.support.media.ExifInterface.ORIENTATION_ROTATE_90;
+import static android.support.media.ExifInterface.ORIENTATION_TRANSPOSE;
+import static android.support.media.ExifInterface.ORIENTATION_TRANSVERSE;
 import static com.google.common.truth.Truth.assertThat;
 import static com.squareup.picasso.BitmapHunter.forRequest;
 import static com.squareup.picasso.BitmapHunter.transformResult;