From dd44b9474dc4288d44c6d207c1f31993b7ecc3c2 Mon Sep 17 00:00:00 2001 From: Graeme Rocher Date: Mon, 26 Sep 2011 14:33:59 +0200 Subject: [PATCH] allow customization of target/source levels for compilation. Fix for GRAILS-7693 "Allow customization of bytecode level for compiler when compiling binary plugins" --- grails-resources/src/grails/grails-app/conf/BuildConfig.groovy | 2 ++ .../src/grails/plugin/grails-app/conf/BuildConfig.groovy | 2 ++ scripts/_GrailsClasspath.groovy | 3 +++ 3 files changed, 7 insertions(+) diff --git a/grails-resources/src/grails/grails-app/conf/BuildConfig.groovy b/grails-resources/src/grails/grails-app/conf/BuildConfig.groovy index 6f2a2485503..d8de62a1ddb 100644 --- a/grails-resources/src/grails/grails-app/conf/BuildConfig.groovy +++ b/grails-resources/src/grails/grails-app/conf/BuildConfig.groovy @@ -2,6 +2,8 @@ grails.servlet.version = "2.5" // Change depending on target container complianc grails.project.class.dir = "target/classes" grails.project.test.class.dir = "target/test-classes" grails.project.test.reports.dir = "target/test-reports" +grails.project.source.level = 1.6 +grails.project.target.level = 1.6 //grails.project.war.file = "target/${appName}-${appVersion}.war" grails.project.dependency.resolution = { diff --git a/grails-resources/src/grails/plugin/grails-app/conf/BuildConfig.groovy b/grails-resources/src/grails/plugin/grails-app/conf/BuildConfig.groovy index 50d886f5512..78334ab3517 100644 --- a/grails-resources/src/grails/plugin/grails-app/conf/BuildConfig.groovy +++ b/grails-resources/src/grails/plugin/grails-app/conf/BuildConfig.groovy @@ -1,6 +1,8 @@ grails.project.class.dir = "target/classes" grails.project.test.class.dir = "target/test-classes" grails.project.test.reports.dir = "target/test-reports" +grails.project.source.level = 1.6 +grails.project.target.level = 1.6 //grails.project.war.file = "target/${appName}-${appVersion}.war" grails.project.dependency.resolution = { diff --git a/scripts/_GrailsClasspath.groovy b/scripts/_GrailsClasspath.groovy index 6f89b500b9e..98d06e4bf1d 100644 --- a/scripts/_GrailsClasspath.groovy +++ b/scripts/_GrailsClasspath.groovy @@ -34,6 +34,9 @@ includeTargets << grailsScript("_GrailsSettings") classpathSet = false includePluginJarsOnClasspath = true projectCompiler = new GrailsProjectCompiler(pluginSettings, classLoader) +def compileConfigLevels = grailsSettings.config.grails.project +projectCompiler.javaOptions.source = compileConfigLevels.source.level ?: 1.6 +projectCompiler.javaOptions.target = compileConfigLevels.target.level ?: 1.6 projectCompiler.ant = ant target(name:'classpath', description: "Sets the Grails classpath", prehook:null, posthook:null) {