Got rid of a warning in the build system and set source/target compatibilty in single place

13 files changed, 48 insertions, 43 deletions

diff --git a/java/build.gradle b/java/build.gradle
index 6f7d578fc58..10f42ecbacc 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -23,6 +23,10 @@ subprojects {
 	        attributes("Built-By": "ZeroC, Inc.")
 	    }
 	}
+
+	tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-Xlint:-options"
+    }
 }
 
 apply from: "$rootProject.projectDir/demo/Ice/build.gradle"
diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle
index da77c6a8038..6709cac28c8 100644
--- a/java/gradle/ice.gradle
+++ b/java/gradle/ice.gradle
@@ -185,3 +185,6 @@ if(appendVersionSuffix != null && appendVersionSuffix == "yes")
 
 
 ext.libDir = "$rootProject.projectDir/lib"
+
+ext.iceSourceCompatibility = 1.7
+ext.iceTargetCompatibility = 1.7
diff --git a/java/gradle/javafx7.gradle b/java/gradle/javafx7.gradle
index ec120ea7515..3f7b03e767f 100644
--- a/java/gradle/javafx7.gradle
+++ b/java/gradle/javafx7.gradle
@@ -1,59 +1,58 @@
 import groovy.xml.NamespaceBuilder
- 
+
 assert project.plugins.findPlugin(JavaPlugin):
         "The Java plugin must be applied before using javafx7.gradle."
- 
+
 assert project.plugins.findPlugin(ApplicationPlugin):
         "The Application plugin must be applied before using javafx7.gradle."
- 
+
 def javaHome = System.properties['java.home']
- 
-logger.warn("Project '$project.name' is using fx:jar. " +
-        "Disabling startScripts, installApp.")
- 
+
+//logger.warn("Project '$project.name' is using fx:jar. " + "Disabling startScripts, installApp.")
+
 configurations {
     jfxrt
     jfxant
- 
+
     sourceSets {
         main {
             compileClasspath += configurations.jfxrt
         }
     }
 }
- 
+
 dependencies {
     jfxrt files("$javaHome" + "/lib/jfxrt.jar")
     jfxant files("$javaHome" + "/../lib/ant-javafx.jar")
 }
- 
+
 run.classpath.add(configurations.jfxrt)
- 
+
 jar {
     actions = []
- 
+
     def appId = project.name
     def fallbackClassName = 'com.javafx.main.NoJavaFXFallback'
- 
+
     def antfx = NamespaceBuilder.newInstance(
             ant,
             'javafx:com.sun.javafx.tools.ant')
- 
- 
+
+
     ant.taskdef(
             resource: 'com/sun/javafx/tools/ant/antlib.xml',
             uri: 'javafx:com.sun.javafx.tools.ant',
             classpath: configurations.jfxant.asPath)
- 
- 
- 
+
+
+
     doLast {
         antfx.application(
                 id: appId,
                 name: project.name,
                 mainClass: mainClassName,
                 fallbackClass: fallbackClassName)
- 
+
         antfx.jar(destfile: archivePath) {
             application(refid: appId)
             fileset(dir: sourceSets.main.output.classesDir)
@@ -61,11 +60,11 @@ jar {
         }
    }
 }
- 
+
 startScripts {
     enabled = false
 }
- 
+
 installApp {
     enabled = false
-}
\ No newline at end of file
+}
diff --git a/java/src/Freeze/build.gradle b/java/src/Freeze/build.gradle
index eb271d9c1f4..2a98af201b7 100644
--- a/java/src/Freeze/build.gradle
+++ b/java/src/Freeze/build.gradle
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = iceSourceCompatibility
+targetCompatibility = iceTargetCompatibility
 
 slice {
     java {
diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle
index 98a1c7352d3..dd4216ba164 100644
--- a/java/src/Glacier2/build.gradle
+++ b/java/src/Glacier2/build.gradle
@@ -7,9 +7,8 @@
 //
 // **********************************************************************
 
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = iceSourceCompatibility
+targetCompatibility = iceTargetCompatibility
 
 slice {
     java {
diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle
index a4c096d393e..0fb56d9609e 100644
--- a/java/src/Ice/build.gradle
+++ b/java/src/Ice/build.gradle
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = iceSourceCompatibility
+targetCompatibility = iceTargetCompatibility
 
 slice {
     java {
diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle
index ce3248a549d..518ea1f6292 100644
--- a/java/src/IceBox/build.gradle
+++ b/java/src/IceBox/build.gradle
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = iceSourceCompatibility
+targetCompatibility = iceTargetCompatibility
 
 slice {
     java {
diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle
index cd65504d34d..db717acbc30 100644
--- a/java/src/IceDiscovery/build.gradle
+++ b/java/src/IceDiscovery/build.gradle
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = iceSourceCompatibility
+targetCompatibility = iceTargetCompatibility
 
 slice {
     java {
diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle
index f36dec177fa..b4cac440e44 100644
--- a/java/src/IceGrid/build.gradle
+++ b/java/src/IceGrid/build.gradle
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = iceSourceCompatibility
+targetCompatibility = iceTargetCompatibility
 
 slice {
     java {
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index 3c270d0acfd..5000443bb93 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = iceSourceCompatibility
+targetCompatibility = iceTargetCompatibility
 
 def hasJavaFx = false
 def javaHome = System.getProperty('java.home')
diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle
index 67312fe2385..770c6a2bedd 100644
--- a/java/src/IcePatch2/build.gradle
+++ b/java/src/IcePatch2/build.gradle
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = iceSourceCompatibility
+targetCompatibility = iceTargetCompatibility
 
 slice {
     java {
diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle
index ff8de187d48..e6c16d180dd 100644
--- a/java/src/IceStorm/build.gradle
+++ b/java/src/IceStorm/build.gradle
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = iceSourceCompatibility
+targetCompatibility = iceTargetCompatibility
 
 slice {
     java {
diff --git a/java/src/ant/build.gradle b/java/src/ant/build.gradle
index a75c3a74e41..a070ba6c42c 100644
--- a/java/src/ant/build.gradle
+++ b/java/src/ant/build.gradle
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = iceSourceCompatibility
+targetCompatibility = iceTargetCompatibility
 
 repositories {
     mavenCentral()