From 3b60e2da50bca7c3b3ee4e847c02325abeb3c8ef Mon Sep 17 00:00:00 2001 From: Martin Goellnitz Date: Fri, 6 May 2016 01:59:44 +0200 Subject: [PATCH] Make tangram plugin in gradle plusing repository jdk 1.7 compatible again --- buildSrc/build.gradle | 12 ++++++++++-- commons.gradle | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 14ae3535..3f4d2a74 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -38,7 +38,15 @@ apply plugin: 'com.jfrog.artifactory' defaultTasks 'clean', 'publishToMavenLocal' -version '1.1.1' +version '1.1.2' + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 + +def bootClasspathStr = "${project.hasProperty('jdk') ? jdk : System.env.JAVA_HOME}/jre/lib/rt.jar" +project.tasks.withType(AbstractCompile, { AbstractCompile ac -> + ac.options.bootClasspath = bootClasspathStr +}) String[] roots = ["${project.projectDir}/src/main/groovy"] def versions = new GroovyScriptEngine(roots).loadScriptByName('org/tangram/gradle/plugin/TangramVersions.groovy').newInstance() @@ -121,7 +129,7 @@ publishing { pluginBundle { website = 'https://github.com/mgoellnitz/tangram/' vcsUrl = 'https://github.com/mgoellnitz/tangram/' - description = 'Generic JPA, JDO, EBean byte code transformation plugin, webapp overlay helper, and minifying plugin developed for Tangram - Verson 1.1.1 is again JDK 1.7 compatible' + description = 'Generic JPA, JDO, EBean byte code transformation plugin, webapp overlay helper, and minifying plugin developed for Tangram - Verson 1.1.2 is again JDK 1.7 compatible' tags = ['tangram', 'jdo', 'jpa', 'ebean', 'datanucleus', 'eclipselink', 'hibernate', 'openjpa', 'overlay', 'minify'] plugins { diff --git a/commons.gradle b/commons.gradle index ada01bea..860a7217 100644 --- a/commons.gradle +++ b/commons.gradle @@ -26,7 +26,7 @@ import org.gradle.api.internal.component.SoftwareComponentInternal import org.gradle.api.tasks.compile.AbstractCompile import groovy.util.Node -version = '1.1.0' +version = '1.1.2' def release = project.hasProperty('release')