Merge remote-tracking branch 'origin/master'

nitzanj · nitzanj · commit 974cf0478a10 · 2018-06-03T16:21:14.000+03:00
# Conflicts:
#	gradle.properties
diff --git a/.travis.yml b/.travis.yml
@@ -15,9 +15,7 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-25.0.3
-    - build-tools-26.0.1
-    - build-tools-27.0.2
+    - build-tools-27.0.3
     - android-21
     - android-27
     - extra-google-google_play_services
diff --git a/gradle-scripts/common.gradle b/gradle-scripts/common.gradle
@@ -12,7 +12,7 @@ allprojects {
         }
 
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.0.1'
+            classpath 'com.android.tools.build:gradle:3.1.2'
         }
     }
 
@@ -21,18 +21,19 @@ allprojects {
     }
 
     repositories {
-        jcenter()
-        mavenCentral()
         maven {
             url "https://maven.google.com"
         }
+
+        jcenter()
+        mavenCentral()
     }
 
     project.ext.set("publishGroupId", group)
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.1'
+    gradleVersion = '4.5'
 }
 
 ext.filterManifest = {manifestPath, newValue ->
diff --git a/gradle.properties b/gradle.properties
@@ -15,5 +15,5 @@ developerEmail=info@cloudinary.com
 group=com.cloudinary
 version=1.24.0
 cloudinaryLibsVersion=1.18.0
-androidSupportVersion=27.0.2
-org.gradle.jvmargs=-Xmx1024m
+androidSupportVersion=27.1.1
+org.gradle.jvmargs=-Xmx1024m
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.2"
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         minSdkVersion 14
@@ -27,7 +27,7 @@ android {
     testVariants.all { variant ->
         variant.outputs.each { output ->
             output.processManifest.doLast {
-                def url = System.getenv('CLOUDINARY_URL') ?: project.findProperty("cloudinaryUrl")
+                def url = System.getenv('CLOUDINARY_URL') ?: project.findProperty("cloudinary.url")
                 if(!url) {
                     throw new GradleException("Missing credentials: please set CLOUDINARY_URL environment variable or cloudianryUrl build property.")
                 }
@@ -40,10 +40,9 @@ android {
 dependencies {
     api "com.cloudinary:cloudinary-core:${cloudinaryLibsVersion}"
 
-    implementation "com.android.support:support-v4:${androidSupportVersion}"
-
-    implementation ('com.evernote:android-job:1.2.1', {
-        exclude group: 'com.android.support', module: 'support-v4'
+    implementation "com.android.support:support-compat:${androidSupportVersion}"
+    implementation ('com.evernote:android-job:1.2.6', {
+        exclude group: 'com.android.support', module: 'support-compat'
     })
 
     testImplementation 'junit:junit:4.12'
@@ -55,8 +54,8 @@ dependencies {
     })
 
     androidTestImplementation "com.android.support:support-annotations:${androidSupportVersion}"
-    androidTestImplementation "com.android.support.test:runner:1.0.1"
-    androidTestImplementation "com.android.support.test:rules:1.0.1"
+    androidTestImplementation "com.android.support.test:runner:1.0.2"
+    androidTestImplementation "com.android.support.test:rules:1.0.2"
     androidTestImplementation "org.hamcrest:hamcrest-library:1.3"
 }
 
diff --git a/lib/src/androidTest/java/com/cloudinary/android/RequestProcessorTest.java b/lib/src/androidTest/java/com/cloudinary/android/RequestProcessorTest.java
@@ -13,7 +13,6 @@
 
 import org.awaitility.Awaitility;
 import org.awaitility.Duration;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -22,13 +21,11 @@
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 @RunWith(AndroidJUnit4.class)
 public class RequestProcessorTest extends AbstractTest {
-    @Test
-    public void testStuff() {
-        Assert.assertEquals(3, 3);
-    }
-
     /**
      * Centralize processor creation in case we want to test different implementations in the future.
      */
@@ -70,13 +67,16 @@ public void testValidUploadWithParams() throws IOException {
         callbackDispatcher.registerCallback(statefulCallback);
         processor.processRequest(InstrumentationRegistry.getTargetContext(), params);
 
+        // wait for result
         Awaitility.await().atMost(Duration.TEN_SECONDS).until(new Callable<Boolean>() {
             @Override
-            public Boolean call() throws Exception {
-                return statefulCallback.lastSuccess != null &&
-                        id.equals(statefulCallback.lastSuccess.get("public_id"));
+            public Boolean call() {
+                return statefulCallback.hasResponse();
             }
         });
+
+        assertNotNull(statefulCallback.lastSuccess);
+        assertEquals(id, statefulCallback.lastSuccess.get("public_id"));
     }
 
     @Test
diff --git a/lib/src/androidTest/java/com/cloudinary/android/StatefulCallback.java b/lib/src/androidTest/java/com/cloudinary/android/StatefulCallback.java
@@ -33,6 +33,10 @@ public void onError(String requestId, ErrorInfo errorObject) {
         this.lastErrorObject = errorObject;
     }
 
+    public boolean hasResponse(){
+        return lastErrorObject != null || lastSuccess != null;
+    }
+
     @Override
     public void onReschedule(String requestId, ErrorInfo error) {
         this.lastReschedule = error;
diff --git a/lib/src/androidTest/java/com/cloudinary/android/UploaderTest.java b/lib/src/androidTest/java/com/cloudinary/android/UploaderTest.java
@@ -364,7 +364,7 @@ public void testRawConvertRequest() {
         try {
             cloudinary.uploader().upload(getAssetStream("docx.docx"), ObjectUtils.asMap("raw_convert", "illegal", "resource_type", "raw"));
         } catch (Exception e) {
-            assertTrue(e.getMessage().matches(".*illegal is not a valid.*"));
+            assertEquals("Raw convert is invalid", e.getMessage());
         }
     }
 
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.2"
+    buildToolsVersion "27.0.3"
     defaultConfig {
         applicationId "com.cloudinary.android.sample"
         minSdkVersion 19
@@ -13,7 +13,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -31,19 +31,19 @@ android {
 }
 
 dependencies {
-    compile project(':lib')
-    compile "com.android.support:appcompat-v7:${androidSupportVersion}"
-    compile "com.android.support.constraint:constraint-layout:1.0.2"
-    compile "com.android.support:recyclerview-v7:${androidSupportVersion}"
-    compile "com.android.support:design:${androidSupportVersion}"
-    compile "com.android.support:cardview-v7:${androidSupportVersion}"
-    compile "com.squareup.picasso:picasso:2.5.2"
-    compile "com.google.android.exoplayer:exoplayer:r2.4.4"
+    implementation project(':lib')
+    implementation "com.android.support:appcompat-v7:${androidSupportVersion}"
+    implementation "com.android.support.constraint:constraint-layout:1.1.0"
+    implementation "com.android.support:recyclerview-v7:${androidSupportVersion}"
+    implementation "com.android.support:design:${androidSupportVersion}"
+    implementation "com.android.support:cardview-v7:${androidSupportVersion}"
+    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation "com.google.android.exoplayer:exoplayer:r2.4.4"
 
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
     })
 
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/sample/proguard-rules.pro b/sample/proguard-rules.pro
@@ -14,3 +14,14 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+# okhttp (for picasso):
+-dontwarn okhttp3.**
+-dontwarn okio.**
+-dontwarn javax.annotation.**
+-dontwarn org.conscrypt.**
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+
+# Cloudinary:
+-keep class com.cloudinary.android.*Strategy
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/EffectsGalleryAdapter.java b/sample/src/main/java/com/cloudinary/android/sample/app/EffectsGalleryAdapter.java
@@ -69,7 +69,7 @@ public void onBindViewHolder(final EffectsGalleryAdapter.ImageViewHolder holder,
                 .generate(baseUrl, holder.imageView, new ResponsiveUrl.Callback() {
                     @Override
                     public void onUrlReady(Url url) {
-                        Picasso.with(context).load(url.generate()).placeholder(R.drawable.placeholder).into(holder.imageView);
+                        Picasso.get().load(url.generate()).placeholder(R.drawable.placeholder).into(holder.imageView);
                     }
                 });
 
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/ImageActivity.java b/sample/src/main/java/com/cloudinary/android/sample/app/ImageActivity.java
@@ -234,7 +234,7 @@ public void onSuccess() {
                     }
 
                     @Override
-                    public void onError() {
+                    public void onError(Exception e) {
                         progressBar.setVisibility(View.GONE);
                     }
                 });
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/MainActivity.java b/sample/src/main/java/com/cloudinary/android/sample/app/MainActivity.java
@@ -351,7 +351,7 @@ public List<AbstractPagerFragment> getPages() {
     public void onDeleteAllLocally() {
         ResourceRepo.getInstance().clear();
         MediaManager.get().cancelAllRequests();
-        PicassoTools.clearCache(Picasso.with(this));
+        PicassoTools.clearCache(Picasso.get());
 
         for (AbstractPagerFragment fragment : getPages()) {
             fragment.clearData();
diff --git a/sample/src/main/java/com/cloudinary/android/sample/app/ResourcesAdapter.java b/sample/src/main/java/com/cloudinary/android/sample/app/ResourcesAdapter.java
@@ -164,7 +164,7 @@ private void bindErrorView(FailedResourceViewHolder holder, int position) {
         holder.errorDescription.setText(resource.getLastErrorDesc());
         boolean isVideo = resource.getResourceType().equals("video");
         int placeHolder = isVideo ? R.drawable.video_placeholder : R.drawable.placeholder;
-        Picasso.with(context).load(resource.getLocalUri()).placeholder(placeHolder).centerCrop().resizeDimen(R.dimen.card_image_width, R.dimen.card_height).into(holder.imageView);
+        Picasso.get().load(resource.getLocalUri()).placeholder(placeHolder).centerCrop().resizeDimen(R.dimen.card_image_width, R.dimen.card_height).into(holder.imageView);
         holder.retryButton.setTag(resource);
         holder.cancelButton.setTag(resource);
         holder.rescheduleLabel.setVisibility(resource.getStatus() == Resource.UploadStatus.RESCHEDULED ? View.VISIBLE : View.GONE);
@@ -233,15 +233,15 @@ private void bindRegularView(final ResourceViewHolder holder, int position) {
         final int placeholder = resource.getResourceType().equals("image") ? R.drawable.placeholder : R.drawable.video_placeholder;
 
         if (local) {
-            Picasso.with(context).load(resource.getLocalUri()).placeholder(placeholder).centerCrop().resize(requiredSize, requiredSize).into(holder.imageView);
+            Picasso.get().load(resource.getLocalUri()).placeholder(placeholder).centerCrop().resize(requiredSize, requiredSize).into(holder.imageView);
         } else {
             String publicId = resource.getCloudinaryPublicId();
             Url url = MediaManager.get().url().publicId(publicId).resourceType(resource.getResourceType()).format("webp");
             MediaManager.get().responsiveUrl(ResponsiveUrl.Preset.AUTO_FILL)
                     .generate(url, holder.imageView, new ResponsiveUrl.Callback() {
                         @Override
                         public void onUrlReady(Url url) {
-                            Picasso.with(context).load(url.generate()).placeholder(placeholder).into(holder.imageView);
+                            Picasso.get().load(url.generate()).placeholder(placeholder).into(holder.imageView);
                         }
                     });
         }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ allprojects {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
`15`		`- classpath 'com.android.tools.build:gradle:3.0.1'`
	`15`	`+ classpath 'com.android.tools.build:gradle:3.1.2'`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`@@ -21,18 +21,19 @@ allprojects {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`repositories {`
`24`		`- jcenter()`
`25`		`- mavenCentral()`
`26`	`24`	`maven {`
`27`	`25`	`url "https://maven.google.com"`
`28`	`26`	`}`
	`27`	`+`
	`28`	`+ jcenter()`
	`29`	`+ mavenCentral()`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`project.ext.set("publishGroupId", group)`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`task wrapper(type: Wrapper) {`
`35`		`- gradleVersion = '4.1'`
	`36`	`+ gradleVersion = '4.5'`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`ext.filterManifest = {manifestPath, newValue ->`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ public void testRawConvertRequest() {`
`364`	`364`	`try {`
`365`	`365`	`cloudinary.uploader().upload(getAssetStream("docx.docx"), ObjectUtils.asMap("raw_convert", "illegal", "resource_type", "raw"));`
`366`	`366`	`} catch (Exception e) {`
`367`		`- assertTrue(e.getMessage().matches(".illegal is not a valid."));`
	`367`	`+ assertEquals("Raw convert is invalid", e.getMessage());`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`