Update libraries and tools versions, fix tests

* Bump cloudinary-core library version to 1.18.0
* Bump android tools and libraries to latest compatible versions
* Bump gradle version to 4.5
* Fix `testRawConvertRequest` with new error message
* Fix categorization request test case
* Fix cloudinary.url param in in build.gradle

Author: nitzanj

.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

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 ->

gradle.properties

@@ -14,6 +14,6 @@ [email protected]
 # These two properties must use these exact names to be compatible with 'gradle install' plugin.
 group=com.cloudinary
 version=1.24.0
-cloudinaryLibsVersion=1.16.0
-androidSupportVersion=27.0.2
-org.gradle.jvmargs=-Xmx1024m
+cloudinaryLibsVersion=1.18.0
+androidSupportVersion=27.1.1
+org.gradle.jvmargs=-Xmx1024m

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

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"
 }
 

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

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;

lib/src/androidTest/java/com/cloudinary/android/UploaderTest.java

@@ -364,20 +364,23 @@ 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());
         }
     }
 
     @Test
     public void testCategorizationRequest() {
+        String errorMessage = "";
         // should support requesting categorization
         if (cloudinary.config.apiSecret == null)
             return;
         try {
             cloudinary.uploader().upload(getAssetStream(TEST_IMAGE), ObjectUtils.asMap("categorization", "illegal"));
         } catch (Exception e) {
-            assertTrue(e.getMessage().matches("(.*)(Illegal value|not a valid|invalid)(.*)"));
+            errorMessage = e.getMessage();
         }
+
+        assertTrue(errorMessage.contains("Categorization item illegal is not valid"));
     }
 
     @Test

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'
 }

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