# HG changeset patch # User smith@nwoca.org # Date 1441055813 -3600 # Node ID cf65e7327fe854585184887335645490a649e6b4 # Parent 55a2f489dbf76678a2d6226757c60c1d0b8fc2e8 use project property for required java version diff -r 55a2f489dbf7 -r cf65e7327fe8 init20.gradle --- a/init20.gradle Mon Aug 31 21:57:16 2015 +0100 +++ b/init20.gradle Mon Aug 31 22:16:53 2015 +0100 @@ -72,10 +72,6 @@ gradle.environment.put('branchStream', gradle.branch.stream) gradle.environment.put('branchHash', gradle.branch.hash) -if (gradle.bambooBuild) { - gradle.runtimeInfo.requireJava( gradle.environment['requireJavaVersion'] ) - -} def cacheTimeout = 60 * 60 * 8 if (gradle.environment['dependencyTimeout']) { @@ -136,6 +132,11 @@ rootProject.afterEvaluate { r -> + + if (gradle.bambooBuild && r.hasProperty('requireJavaVersion')) { + gradle.runtimeInfo.requireJava( r.getProperty('requireJavaVersion') ) + } + if (r.plugins.hasPlugin(org.gradle.plugins.ide.idea.IdeaPlugin)) { r.idea.project.ipr.withXml { xml ->