Merge branch 'master' into patch-1

Author: tocker

.gitignore

@@ -33,23 +33,10 @@ test-output/
 .classpath
 .project
 
+# intellij
+.idea/
 *.iml
 
 appengine-web.xml
+cloudinary-android/src/androidTest/AndroidManifest.xml
 
-cloudinary-android-test/src/main/AndroidManifest.xml
-
-# Maven
-
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-
-# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
-!/.mvn/wrapper/maven-wrapper.jar

.travis.yml

@@ -0,0 +1,31 @@
+language: android
+
+android:
+  components:
+    - tools
+    - platform-tools
+    - tools
+    - build-tools-25.0.2
+    - android-25
+    - extra-android-m2repository
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
+jdk:
+  - oraclejdk8
+
+#  Android build tools 25 require java 8 - until project separation java 7 tests are disabled
+#  - oraclejdk7
+#  - openjdk7
+
+# Temporarily disabled, test fail because Hamcrest needs java 1.7
+#  - openjdk6
+
+# ciTest is configured to skip the various timeout tests that don't work in travis
+script: ./gradlew clean ciTest

CHANGELOG.md

@@ -1,4 +1,25 @@
 
+1.13.0 / 2017-06-12
+===================
+
+New functionality
+-----------------
+
+  * Add support for `format` in Responsive breakpoints transformation. (#78)
+  * Add `url_suffix` support for private images. (#76)
+  * Add `type` parameter to `Api.publishResource()` (#73)
+  * Add support for fetch overlay/underlay (#69)
+  * Add `deleteByToken` to `Uploader`.
+  * Rename `deleteDerivedResourcesByTransformations` to `deleteDerivedByTransformation`
+  * Fix `deleteStreamProfile` no-options overload.
+  * Add support for *TravisCI* tests
+  * Replace Maven with Gradle as build tool
+
+Other changes
+-------------
+
+  * Parallelize tests.
+
 1.12.0 / 2017-05-01
 ===================
 

README.md

@@ -29,12 +29,11 @@ The cloudinary_java library is available in [Maven Central](https://repo1.maven.
 <dependency>
     <groupId>com.cloudinary</groupId>
     <artifactId>cloudinary-http44</artifactId>
-    <version>1.12.0</version>
+    <version>1.13.0</version>
 </dependency>
 ```
 
-
-Alternatively, download cloudinary_java from [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-core/1.12.0/cloudinary-core-1.12.0.jar) and [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-http44/1.12.0/cloudinary-http44-1.12.0.jar)
+Alternatively, download cloudinary_java from [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-core/1.13.0/cloudinary-core-1.13.0.jar) and [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-http44/1.13.0/cloudinary-http44-1.13.0.jar)
 and see [pom.xml](https://github.com/cloudinary/cloudinary_java/blob/master/cloudinary-http44/pom.xml) for library dependencies.
 
 ## Try it right away

build.gradle

@@ -0,0 +1,26 @@
+buildscript {
+}
+
+allprojects {
+    apply plugin: 'maven'
+    apply plugin: 'signing'
+
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+
+    signing {
+        sign configurations.archives
+    }
+    project.ext.set("publishGroupId", group)
+}
+
+subprojects {
+    tasks.withType(Test) {
+        maxParallelForks = Runtime.runtime.availableProcessors()
+
+        // show standard out and standard error of the test JVM(s) on the console
+        testLogging.showStandardStreams = true
+    }
+}