[Java] Improve build for Java 10 plus upgrade to Gradle 4.7.

isabella232 · Apr 28, 2018 · eb88a68 · eb88a68
1 parent 669d013
commit eb88a68
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 27 deletions.
diff --git a/agrona/src/main/java/org/agrona/collections/IntHashSet.java b/agrona/src/main/java/org/agrona/collections/IntHashSet.java
@@ -399,7 +399,7 @@ public boolean addAll(final Collection<? extends Integer> coll)
      * avoids boxing and allocations
      *
      * @param coll containing the values to be added.
-     * @return <tt>true</tt> if this set changed as a result of the call
+     * @return {@code true} if this set changed as a result of the call
      */
     public boolean addAll(final IntHashSet coll)
     {
@@ -498,7 +498,7 @@ public boolean removeAll(final Collection<?> coll)
      * avoids boxing and allocations
      *
      * @param coll containing the values to be removed.
-     * @return <tt>true</tt> if this set changed as a result of the call
+     * @return {@code true} if this set changed as a result of the call
      */
     public boolean removeAll(final IntHashSet coll)
     {

diff --git a/agrona/src/main/java/org/agrona/collections/ObjectHashSet.java b/agrona/src/main/java/org/agrona/collections/ObjectHashSet.java
@@ -368,7 +368,7 @@ public boolean addAll(final Collection<? extends T> coll)
      * avoids boxing and allocations
      *
      * @param coll containing the values to be added.
-     * @return <tt>true</tt> if this set changed as a result of the call
+     * @return {@code true} if this set changed as a result of the call
      */
     public boolean addAll(final ObjectHashSet<T> coll)
     {
@@ -426,7 +426,7 @@ public boolean removeAll(final Collection<?> coll)
      * avoids boxing and allocations
      *
      * @param coll containing the values to be removed.
-     * @return <tt>true</tt> if this set changed as a result of the call
+     * @return {@code true} if this set changed as a result of the call
      */
     public boolean removeAll(final ObjectHashSet<T> coll)
     {

diff --git a/build.gradle b/build.gradle
@@ -114,13 +114,6 @@ subprojects {
 
     jar.enabled = true
 
-    [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-
-    compileJava {
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
-    }
-
     dependencies {
         checkstyle 'com.puppycrawl.tools:checkstyle:8.9'
 
@@ -129,6 +122,27 @@ subprojects {
         testCompile 'org.hamcrest:hamcrest-library:1.3'
         testCompile 'com.google.guava:guava-testlib:23.5-jre'
     }
+
+    compileJava {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+        options.compilerArgs << '-XDignore.symbol.file' // Suppress warnings about using Unsafe
+        options.fork = true
+        options.forkOptions.javaHome = file("${System.env.JAVA_HOME}")
+        options.encoding = 'UTF-8'
+        options.deprecation = true
+    }
+
+
+    compileTestJava {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+        options.compilerArgs << '-XDignore.symbol.file' // Suppress warnings about using Unsafe
+        options.fork = true
+        options.forkOptions.javaHome = file("${System.env.JAVA_HOME}")
+        options.encoding = 'UTF-8'
+        options.deprecation = true
+    }
 
     test {
         testLogging {
@@ -145,6 +159,9 @@ subprojects {
     javadoc {
         title = '<h1>Agrona</h1>'
         options.bottom = '<i>Copyright &#169; 2014-2018 Real Logic Ltd. All Rights Reserved.</i>'
+        if (JavaVersion.current() == JavaVersion.VERSION_1_10) {
+            options.addBooleanOption 'html5', true
+        }
     }
 
     signing {
@@ -160,13 +177,6 @@ project(':agrona') {
         throw new GradleException('JAVA_HOME environment variable required')
     }
 
-    compileJava {
-        // Suppress warnings about using Unsafe and sun.misc
-        options.compilerArgs << '-XDignore.symbol.file'
-        options.fork = true
-        options.forkOptions.javaHome = file("${System.env.JAVA_HOME}")
-    }
-
     uploadArchives {
         repositories {
             mavenDeployer {
@@ -244,13 +254,6 @@ project(':agrona') {
 project(':agrona-agent') {
     apply plugin: 'com.github.johnrengelman.shadow'
 
-    compileTestJava {
-        // Suppress warnings about using Unsafe and sun.misc
-        options.compilerArgs << '-XDignore.symbol.file'
-        options.fork = true
-        options.forkOptions.javaHome = file("${System.env.JAVA_HOME}")
-    }
-
     dependencies {
         compile project(':agrona')
         compile "net.bytebuddy:byte-buddy:1.8.5"
@@ -350,6 +353,6 @@ task uploadToMavenCentral {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.6'
+    gradleVersion = '4.7'
     distributionType = 'ALL'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists