From 8a8320ef5c1057c05b36faf556bda98b5576856e Mon Sep 17 00:00:00 2001 From: Artur Stepniewski Date: Sun, 29 Nov 2015 15:19:23 +0100 Subject: [PATCH] Make it possible to run the plugin with Java 7 --- .travis.yml | 2 +- CHANGELOG.md | 3 +++ build.gradle | 14 ++++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea43fbf..e1c86ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ jdk: oraclejdk8 sudo: false android: components: - - build-tools-23.0.0 + - build-tools-23.0.2 - android-23 cache: directories: diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a46bbb..002d8d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # Change Log +## Version 0.1.1-SNAPSHOT +* Make it possible to use the plugin with Java 7 + ## Version 0.1.0 *(2015-09-13)* * Initial release diff --git a/build.gradle b/build.gradle index 94fa3f1..a922c07 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,12 @@ plugins { id 'groovy' id 'maven-publish' id 'jacoco' - id 'pl.allegro.tech.build.axion-release' version '1.3.1' - id 'com.jfrog.bintray' version '1.3.1' + id 'pl.allegro.tech.build.axion-release' version '1.3.3' + id 'com.jfrog.bintray' version '1.5' } +sourceCompatibility = JavaVersion.VERSION_1_5 + configurations { provided } @@ -15,15 +17,15 @@ repositories { } dependencies { - compile 'org.codehaus.groovy:groovy-all:2.3.10' + compile 'org.codehaus.groovy:groovy-all:2.4.4' compile gradleApi() - provided 'com.google.code.findbugs:jsr305:2.0.1' + provided 'com.google.code.findbugs:jsr305:3.0.1' - testCompile(group: 'org.spockframework', name: 'spock-core', version: '1.0-groovy-2.3') { + testCompile(group: 'org.spockframework', name: 'spock-core', version: '1.0-groovy-2.4') { exclude group: 'org.codehaus.groovy', module: 'groovy-all' } - testCompile 'com.android.tools.build:gradle:1.3.1' + testCompile 'com.android.tools.build:gradle:1.5.0' } scmVersion { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 147defd..a8674f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip