Use different version of guava for Gradle 5.5+ (asciidoctor#424)

ysb33r · Jul 3, 2019 · 207382b · 207382b
1 parent 50cf30e
commit 207382b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/asciidoctor-gradle-jvm/src/main/groovy/org/asciidoctor/gradle/internal/JavaExecUtils.groovy b/asciidoctor-gradle-jvm/src/main/groovy/org/asciidoctor/gradle/internal/JavaExecUtils.groovy
@@ -82,14 +82,16 @@ class JavaExecUtils {
 
     /** Returns the location of the local Groovy Jar that is used by Gradle.
      *
-     * @return Location on filesysetm where the Groovy Jar is located.
+     * @return Location on filesystem where the Groovy Jar is located.
      */
     static File getLocalGroovy() {
         getClassLocation(GroovyObject)
     }
 
     private static String internalGuavaName() {
-        if (GradleVersion.current() >= GradleVersion.version('5.0')) {
+        if (GradleVersion.current() >= GradleVersion.version('5.5')) {
+            'guava-27.1-android.jar'
+        } else if (GradleVersion.current() >= GradleVersion.version('5.0')) {
             'guava-26.0-android.jar'
         } else {
             'guava-jdk5-17.0.jar'

diff --git a/gradle/compatibility-tests.gradle b/gradle/compatibility-tests.gradle
@@ -5,27 +5,27 @@ pluginManager.withPlugin('org.ysb33r.cloudci') {
         travisci {
             gradleTest {
                 if (JavaVersion.current().java11) {
-                    versions '4.8.1', '5.3'
+                    versions '4.8.1', '5.5'
                 } else {
                     versions '4.0.2', '5.1.1'
                 }
             }
         }
         appveyor {
             gradleTest {
-                versions '4.0.2', '4.10.2', '5.0', '5.3'
+                versions '4.0.2', '4.10.2', '5.0', '5.5'
             }
         }
         no_ci {
             gradleTest {
                 if (JavaVersion.current().java12) {
-                    versions '5.4'
+                    versions '5.4.1', '5.5'
                 }  else if (JavaVersion.current().java11) {
-                    versions '4.8.1', '5.0', '5.1.1', '5.4'
+                    versions '4.8.1', '5.0', '5.4.1', '5.5'
                 } else if (JavaVersion.current().java10) {
-                    versions '4.7', '5.0', '5.1.1'
+                    versions '4.7', '5.0', '5.1.1', '5.5'
                 } else {
-                    versions '4.0.2', '5.0', '5.1.1', '5.4'
+                    versions '4.0.2', '5.0', '5.4.1', '5.5'
                 }
             }
         }