updated source/target compatibility options to use java 1.7, ending support for 1.6. Also updated the JAVA_JRE_7 env variable for the finding jars for the boot class path.

Author: littleaj

gradle/common-java.gradle

@@ -27,25 +27,27 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat;
 
 apply plugin: 'java'
 
-def java6JreDir = System.env.'JAVA_JRE_6'
-if (java6JreDir) {
-    def requiredJava6Archives = ["rt.jar", "jsse.jar"]
+def java7JreDir = System.env.'JAVA_JRE_7'
+if (java7JreDir) {
+    def requiredJavaBootArchives = ["rt.jar", "jsse.jar"]
     def bootClasspath = ""
-    requiredJava6Archives.each { a ->
-        def archivePath = new File(java6JreDir, "lib/$a")
+    requiredJavaBootArchives.each { a ->
+        def archivePath = new File(java7JreDir, "lib/$a")
         if (!archivePath.exists()) {
-            throw new ProjectConfigurationException("Archive $archivePath required for building in Java 6 could not be found.", null)
+            throw new ProjectConfigurationException("Archive $archivePath required for building in Java 7 could not be found.", null)
         }
         logger.info "Archive '$archivePath' added to boot class path"
         bootClasspath += "$archivePath;"
     }
     tasks.withType(JavaCompile) {
-        sourceCompatibility = 1.6
-        targetCompatibility = 1.6
+        sourceCompatibility = 1.7
+        targetCompatibility = 1.7
         options.bootClasspath = bootClasspath
     }
 } else {
-    logger.warn "Environment variable 'JAVA_JRE_6' is not defined - falling back to use machine default Java SDK"
+    // FIXME this warning only makes sense if the JDK version being used is > 1.7.
+    // FIXME if this warning makes sense, it should be fatal if this is intended for release
+    logger.warn "IMPORTANT: Environment variable 'JAVA_JRE_7' is not defined - Install JRE 7 and set 'JAVA_JRE_7' to prevent runtime compatibility issues!"
 }
 
 if (hasProperty("JDKToUse")) {
@@ -63,6 +65,7 @@ if (hasProperty("JDKToUse")) {
     tasks.withType(AbstractCompile) {
         options.with {
             fork = true
+            // FIXME forkOptions.executable is deprecated
             forkOptions.executable = javaExecutables.javac
         }
     }