diff --git a/.travis.yml b/.travis.yml index 5339edb..edafef6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: java -# Only the oraclejdk7 build on a tag will actually release jdk: -- oraclejdk7 - oraclejdk8 # Using 'install' to run the clean to avoid Travis automatically calling diff --git a/build.gradle b/build.gradle index df4c73c..2e31efb 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,23 @@ version = '0.4.0' mainClassName = 'com.github.lookout.verspaetung.Main' defaultTasks 'check', 'assemble' +/* Ensure we properly build for JDK7 still */ +plugins.withType(JavaPlugin) { + sourceCompatibility = 1.7 + targetCompatibility = 1.7 + + + project.tasks.withType(JavaCompile) { task -> + task.sourceCompatibility = project.sourceCompatibility + task.targetCompatibility = project.targetCompatibility + } + + project.tasks.withType(GroovyCompile) { task -> + task.sourceCompatibility = project.sourceCompatibility + task.targetCompatibility = project.targetCompatibility + } +} + //////////////////////////////////////////////////////////////////////////////// // TESTING @@ -147,10 +164,10 @@ bintray { publish = true /* * Only only publish when we're tagging a release and if we've executed on - * the JDK7 build. This is to prevent multiple attempts by the build matrix + * a JDK8 build. This is to prevent multiple attempts by the build matrix * to publish the artifacts */ - dryRun = !((System.env.TRAVIS_TAG as boolean) && (System.env.TRAVIS_JDK_VERSION == 'oraclejdk7')) + dryRun = !((System.env.TRAVIS_TAG as boolean) && (System.env.TRAVIS_JDK_VERSION == 'oraclejdk8')) configurations = ['archives'] pkg {