Make compatible with java 10 and update dependencies

Author: rubengees

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "net.ltgt.gradle:gradle-errorprone-plugin:$errorpronePluginVersion"
+        classpath "net.ltgt.gradle:gradle-errorprone-javacplugin-plugin:$errorpronePluginVersion"
 
         classpath "gradle.plugin.de.fuerstenau:BuildConfigPlugin:$buildConfigPluginVersion"
         classpath "com.github.ben-manes:gradle-versions-plugin:$gradleVersionsPluginVersion"

gradle/versions.gradle

@@ -2,9 +2,9 @@ ext {
     version = '4.4.2'
     group = 'com.github.proxer'
 
-    gradleVersion = '4.8.1'
+    gradleVersion = '4.9'
 
-    errorpronePluginVersion = '0.0.13'
+    errorpronePluginVersion = '0.3'
     gradleVersionsPluginVersion = '0.20.0'
     buildConfigPluginVersion = '1.1.8'
     freefairPluginsVersion = '2.4.2'
@@ -25,7 +25,7 @@ ext {
     moshiLazyAdaptersVersion = '2.2'
 
     junitVersion = '4.12'
-    assertjVersion = '3.10.0'
+    assertjVersion = '3.11.0'
     privateConstructorVersion = '1.2.0'
 
     deps = [

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,13 +1,14 @@
 import groovy.io.FileType
 import groovy.text.SimpleTemplateEngine
+import net.ltgt.gradle.errorprone.javacplugin.CheckSeverity
 
-import java.util.regex.Matcher
+import java.nio.file.Files
 import java.util.regex.Pattern
 
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
 
-apply plugin: 'net.ltgt.errorprone'
+apply plugin: 'net.ltgt.errorprone-javacplugin'
 apply plugin: 'checkstyle'
 apply plugin: 'findbugs'
 apply plugin: 'jacoco'
@@ -48,10 +49,6 @@ dependencies {
     testImplementation deps.privateConstructor
 }
 
-tasks.withType(JavaCompile) {
-    options.compilerArgs += [ '-Xep:ParameterName:OFF' ]
-}
-
 task generatePackageInfo {
     File generatedPackageInfoDir = file("$buildDir/generated")
 
@@ -72,15 +69,11 @@ task generatePackageInfo {
         sourceSets.main.java.srcDirs.each {
             it.eachFileRecurse(FileType.FILES) {
                 if (it.name.endsWith('.java')) {
-                    List<String> fileLines = it.readLines()
-
-                    if (!fileLines.isEmpty()) {
-                        Matcher matcher = packagePattern.matcher(fileLines.first())
-
-                        if (matcher.matches()) {
-                            packages += matcher.group(1)
-                        }
-                    }
+                    Files.lines(it.toPath())
+                            .map { line -> packagePattern.matcher(line) }
+                            .filter { matcher -> matcher.matches() }
+                            .findFirst()
+                            .ifPresent { matcher -> packages += matcher.group(1) }
                 }
             }
         }
@@ -130,10 +123,6 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
 }
 
-compileJava {
-    options.compilerArgs << "-Werror" << "-Xep:ParameterName:OFF"
-}
-
 buildConfig {
     packageName = 'me.proxer.library'
     version = project.version
@@ -201,7 +190,7 @@ publishing {
             }
 
             pom {
-                name =  'ProxerLibJava'
+                name = 'ProxerLibJava'
                 description = 'An Java and Android library, implementing the API of the Proxer.me website'
                 url = 'https://github.com/proxer/ProxerLibJava'
 
@@ -235,8 +224,21 @@ publishing {
     }
 }
 
-test { finalizedBy jacocoTestReport }
+afterEvaluate {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Werror"
+        options.encoding = 'UTF-8'
+
+        // Something seems to add a JavaCompile type task which does not has the errorprone property.
+        if (options.hasProperty("errorprone")) {
+            options.errorprone {
+                disableWarningsInGeneratedCode = true
+
+                check("ParameterName", CheckSeverity.OFF)
+            }
+        }
+    }
 
-gradle.projectsEvaluated {
     compileJava.dependsOn(generatePackageInfo)
+    test { finalizedBy jacocoTestReport }
 }