Consolidate java gradle config, setup test logging.

Author: nitzanj

.travis.yml

@@ -19,8 +19,11 @@ cache:
 
 jdk:
   - oraclejdk8
-  - oraclejdk7
-  - openjdk7
+
+#  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
 

cloudinary-core/build.gradle

@@ -1,10 +1,4 @@
-apply plugin: 'java'
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-tasks.withType(JavaCompile) {
-	options.encoding = 'UTF-8'
-}
+apply from: "../java_shared.gradle"
 
 dependencies {
     testCompile group: 'org.hamcrest', name: 'java-hamcrest', version:'2.0.0.0'

cloudinary-http42/build.gradle

@@ -1,10 +1,4 @@
-apply plugin: 'java'
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
+apply from: "../java_shared.gradle"
 
 dependencies {
     compile project(':cloudinary-core')
@@ -18,12 +12,6 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
-task ciTest( type: Test ) {
-    useJUnit {
-        excludeCategories 'com.cloudinary.test.TimeoutTest'
-    }
-}
-
 uploadArchives {
     repositories {
         mavenDeployer {

cloudinary-http43/build.gradle

@@ -1,10 +1,4 @@
-apply plugin: 'java'
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
+apply from: "../java_shared.gradle"
 
 dependencies {
     compile project(':cloudinary-core')
@@ -17,12 +11,6 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
-task ciTest( type: Test ) {
-    useJUnit {
-        excludeCategories 'com.cloudinary.test.TimeoutTest'
-    }
-}
-
 uploadArchives {
     repositories {
         mavenDeployer {

cloudinary-http44/build.gradle

@@ -1,10 +1,4 @@
-apply plugin: 'java'
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
+apply from: "../java_shared.gradle"
 
 dependencies {
     compile project(':cloudinary-core')
@@ -17,12 +11,6 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
-task ciTest( type: Test ) {
-    useJUnit {
-        excludeCategories 'com.cloudinary.test.TimeoutTest'
-    }
-}
-
 uploadArchives {
     repositories {
         mavenDeployer {

cloudinary-taglib/build.gradle

@@ -1,14 +1,4 @@
-apply plugin: 'java'
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
-
-configurations.all {
-}
+apply from: "../java_shared.gradle"
 
 dependencies {
     compile project(':cloudinary-core')

cloudinary-test-common/build.gradle

@@ -1,10 +1,4 @@
-apply plugin: 'java'
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
+apply from: "../java_shared.gradle"
 
 dependencies {
     compile project(':cloudinary-core')

java_shared.gradle

@@ -0,0 +1,18 @@
+apply plugin: 'java'
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+test {
+    testLogging.showStandardStreams = true
+    testLogging.exceptionFormat = 'full'
+}
+
+task ciTest( type: Test ) {
+    useJUnit {
+        excludeCategories 'com.cloudinary.test.TimeoutTest'
+    }
+}