[Java] Tidy up travis script.

Author: mjpt777

.travis.yml

@@ -1,154 +1,130 @@
-language: cpp
-
 jdk: oraclejdk8
 
 sudo: false
 
 matrix:
   include:
 
-  - name: "Oracle Java 8"
-    language: java
-    jdk: oraclejdk8
-    os: linux
-    script:
-    - ./gradlew
-
-  - name: "Oracle Java 11"
-    language: java
-    jdk: oraclejdk11
-    os: linux
-    script:
-    - ./gradlew
-
-  - name: "OpenJDK 8"
-    language: java
-    jdk: openjdk8
-    os: linux
-    script:
-    - ./gradlew
-
-  - name: "OpenJDK 11"
-    language: java
-    jdk: openjdk11
-    os: linux
-    script:
-    - ./gradlew
-
-  # clang-4
-  - env: COMPILER=clang++-4.0
-    compiler: clang
-    os: linux
-    addons:
-      apt:
-        packages:
-        - clang-4.0
-        - libstdc++-6-dev
-        - libsparsehash-dev
-        sources:
-        - ubuntu-toolchain-r-test
-        - llvm-toolchain-trusty-4.0
-    before_script:
-    - export CXX=$COMPILER
-    - ./gradlew
-    script:
-    - ./cppbuild/cppbuild
-
-  # clang-5
-  - env: COMPILER=clang++-5.0
-    compiler: clang
-    os: linux
-    addons:
-      apt:
-        packages:
-        - clang-5.0
-        - libstdc++-7-dev
-        - libsparsehash-dev
-        sources:
-        - ubuntu-toolchain-r-test
-        - llvm-toolchain-trusty-5.0
-    before_script:
-    - export CXX=$COMPILER
-    - ./gradlew
-    script:
-    - ./cppbuild/cppbuild
-
-  # clang-6
-  - env: COMPILER=clang++-6.0
-    compiler: clang
-    os: linux
-    addons:
-      apt:
-        packages:
-        - clang-6.0
-        - libstdc++-7-dev
-        - libsparsehash-dev
-        sources:
-        - ubuntu-toolchain-r-test
-        - llvm-toolchain-trusty-6.0
-    before_script:
-    - export CXX=$COMPILER
-    - ./gradlew
-    script:
-    - ./cppbuild/cppbuild
-
-  # gcc-6
-  - env: COMPILER=g++-6
-    compiler: gcc
-    os: linux
-    addons:
-      apt:
-        packages:
-        - g++-6
-        - libsparsehash-dev
-        sources:
-        - ubuntu-toolchain-r-test
-    before_script:
-    - export CXX=$COMPILER
-    - ./gradlew
-    script:
-    - ./cppbuild/cppbuild
-
-  # gcc-7
-  - env: COMPILER=g++-7
-    compiler: gcc
-    os: linux
-    addons:
-      apt:
-        packages:
-        - g++-7
-        - libsparsehash-dev
-        sources:
-        - ubuntu-toolchain-r-test
-    before_script:
-    - export CXX=$COMPILER
-    - ./gradlew
-    script:
-    - ./cppbuild/cppbuild
-
-  # gcc-8
-  - env: COMPILER=g++-8
-    compiler: gcc
-    os: linux
-    addons:
-      apt:
-        packages:
-        - g++-8
-        - libsparsehash-dev
-        sources:
-        - ubuntu-toolchain-r-test
-    before_script:
-    - export CXX=$COMPILER
-    - ./gradlew
-    script:
-    - ./cppbuild/cppbuild
+    - name: "Oracle Java 8"
+      language: java
+      jdk: oraclejdk8
+      os: linux
+      script: ./gradlew
+
+    - name: "Oracle Java 11"
+      language: java
+      jdk: oraclejdk11
+      os: linux
+      script: ./gradlew
+
+    - name: "OpenJDK 8"
+      language: java
+      jdk: openjdk8
+      os: linux
+      script: ./gradlew
+
+    - name: "OpenJDK 11"
+      language: java
+      jdk: openjdk11
+      os: linux
+      script: ./gradlew
+
+    - env: COMPILER=clang++-4.0
+      language: cpp
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages:
+            - clang-4.0
+            - libstdc++-6-dev
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0
+      before_script: ./gradlew
+      script: ./cppbuild/cppbuild
+
+    - env: COMPILER=clang++-5.0
+      language: cpp
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages:
+            - clang-5.0
+            - libstdc++-7-dev
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0
+      before_script: ./gradlew
+      script: ./cppbuild/cppbuild
+
+    - env: COMPILER=clang++-6.0
+      language: cpp
+      compiler: clang
+      os: linux
+      addons:
+        apt:
+          packages:
+            - clang-6.0
+            - libstdc++-7-dev
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-6.0
+      before_script: ./gradlew
+      script: ./cppbuild/cppbuild
+
+    - env: COMPILER=g++-6
+      language: cpp
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages:
+            - g++-6
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+      before_script: ./gradlew
+      script: ./cppbuild/cppbuild
+
+    - env: COMPILER=g++-7
+      language: cpp
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages:
+            - g++-7
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+      before_script: ./gradlew
+      script: ./cppbuild/cppbuild
+
+    - env: COMPILER=g++-8
+      language: cpp
+      compiler: gcc
+      os: linux
+      addons:
+        apt:
+          packages:
+            - g++-8
+            - libsparsehash-dev
+          sources:
+            - ubuntu-toolchain-r-test
+      before_script: ./gradlew
+      script: ./cppbuild/cppbuild
 
 
 before_cache:
-- rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - 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/
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/