Merge pull request #413 from inferred/fix.gradle.jdk11.issue

alicederyn · web-flow · commit 008e1d77091e · 2019-05-22T15:06:16.000+01:00
Fix issue when running gradle in JDK 11
diff --git a/build.gradle b/build.gradle
@@ -45,7 +45,7 @@ dependencies {
   compile googleJavaFormat
   compile guava
   compileOnly autoService
-  compileOnly files(org.gradle.internal.jvm.Jvm.current().toolsJar)
+  compileOnly files(jvms["1.8"].toolsJar)
   annotationProcessor autoService
 
   testCompile guavaTestlib
diff --git a/gradle/java-compatibility.gradle b/gradle/java-compatibility.gradle
@@ -30,6 +30,7 @@ Map<Integer, Jvm> jvms = [:].withDefault { String versionString ->
   return javaInfo
 }
 jvms[(JavaVersion.current().name)] = Jvm.current()
+project.ext.jvms = jvms
 
 // Fork the correct JVM version if installed.
 // Runs lazily so users lacking some JVMs can still run most tasks.

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ Map<Integer, Jvm> jvms = [:].withDefault { String versionString ->`
`30`	`30`	`return javaInfo`
`31`	`31`	`}`
`32`	`32`	`jvms[(JavaVersion.current().name)] = Jvm.current()`
	`33`	`+project.ext.jvms = jvms`
`33`	`34`
`34`	`35`	`// Fork the correct JVM version if installed.`
`35`	`36`	`// Runs lazily so users lacking some JVMs can still run most tasks.`