Upgrade to Grolifant 2.0.0

asciidoctor · May 31, 2023 · 0ff9daf · 0ff9daf
1 parent a70bd00
commit 0ff9daf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,8 @@
+<<<<<<< Updated upstream
 version = 3.3.2
+=======
+version = 4.0.0-alpha.2
+>>>>>>> Stashed changes
 group = org.asciidoctor
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -16,7 +20,11 @@ bintray_dryRun = false
 cglibVersion           = 3.3.0
 jsoupVersion           = 1.13.1
 spockVersion           = 1.3-groovy-2.5
+<<<<<<< Updated upstream
 grolifantVersion       = 0.16.1
+=======
+grolifantVersion       = 2.0.0
+>>>>>>> Stashed changes
 jacocoVersion          = 0.8.6
 jrubyGradleVersion     = 2.0.2
 codenarcVersion        = 1.3

diff --git a/gradle/compatibility-tests.gradle b/gradle/compatibility-tests.gradle
@@ -2,6 +2,7 @@ apply plugin: 'org.ysb33r.gradletest'
 
 pluginManager.withPlugin('org.ysb33r.cloudci') {
     ci {
+<<<<<<< Updated upstream
         travisci {
             gradleTest {
                 if (JavaVersion.current().java11) {
@@ -23,6 +24,11 @@ pluginManager.withPlugin('org.ysb33r.cloudci') {
                 } else {
                     versions '4.9', '5.0', '5.5.1', '6.0.1', '6.7'
                 }
+=======
+        no_ci {
+            gradleTest {
+                versions '7.0.2', '7.6', '8.1.1'
+>>>>>>> Stashed changes
             }
         }
     }