Merge pull request #1895 from iBotPeaches/issue-1894

Drop 1.7, Add 1.8

.travis.yml

@@ -1,23 +1,21 @@
 env:
-   - TERM=dumb
+   - TERM=dumb GROOVY_TURN_OFF_JAVA_WARNINGS=true
 language: java
-dist: precise
+dist: trusty
 matrix:
   include:
     - os: linux
-      jdk: openjdk7
+      jdk: openjdk8
-    - os: linux
+#    - os: linux
-      dist: precise
+#      jdk: openjdk9
-      jdk: oraclejdk7
     - os: linux
       jdk: oraclejdk8
-    - os: linux
+#    - os: linux
-      dist: trusty
+#      jdk: oraclejdk9
-      jdk: openjdk8
     - os: osx
       osx_image: xcode9.2
-  allow_failures:
+#    - os: osx
-    - jdk: openjdk7
+#      osx_image: xcode9.4
 cache:
   directories:
     - $HOME/.gradle/caches/

build.gradle

@@ -39,8 +39,8 @@ defaultTasks 'build', 'shadowJar', 'proguard'
 allprojects {
     apply plugin: 'java'
     apply plugin: 'license'
-    sourceCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_8
 
     license {
         header rootProject.file("brut.j.common/src/templates/apache2.0-header.txt")
@@ -88,11 +88,11 @@ if (!('release' in gradle.startParameter.taskNames)) {
 build.doFirst {
     def javaVersion = System.getProperty("java.version")
 
-    //fail the build if we java 1.5 or 1.6.
+    // fail the build if java (1.5/1.6/1.7)
-    if (javaVersion.startsWith("1.5") || javaVersion.startsWith("1.6")) {
+    if (javaVersion.startsWith("1.5") || javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7")) {
         throw new GradleException("You can fix this problem!\n" +
                 "We found a " + javaVersion + " JDK\n" +
-                "Please update JAVA_HOME to use at least a 1.7 JDK\n" +
+                "Please update JAVA_HOME to use at least a 1.8 JDK\n" +
                 "Currently it is set to: " + System.getProperty("java.home")
         );
     }
@@ -113,7 +113,7 @@ subprojects {
                 commons_lang: 'org.apache.commons:commons-lang3:3.1',
                 guava: 'com.google.guava:guava:14.0',
                 junit: 'junit:junit:4.12',
-                proguard_gradle: 'net.sf.proguard:proguard-gradle:5.2.1',
+                proguard_gradle: 'net.sf.proguard:proguard-gradle:6.0.3',
                 snakeyaml: 'org.yaml:snakeyaml:1.18:android',
                 smali: 'org.smali:smali:2.2.5',
                 xmlpull: 'xpp3:xpp3:1.1.4c',
@@ -131,3 +131,8 @@ subprojects {
         }
     }
 }
+
+wrapper {
+    gradleVersion = '4.10'
+    distributionType = Wrapper.DistributionType.ALL
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Thu Aug 16 07:13:34 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip