Baseline 4.0.0 codebase

- Upgraded Grolifant libray and adjusted use of ProjectOperations to avoid messages about configuration cache. Also updated package names where there were breaking changes. - Updated NPM modules for exporting slides. - Changed many 'compile' configurations to 'implementation' or 'api'. Some are still there and needs fixing.
asciidoctor · Aug 23, 2022 · 2b79b6f · 2b79b6f
1 parent 5925e41
commit 2b79b6f
Show file tree

Hide file tree

Showing 85 changed files with 450 additions and 437 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -118,7 +118,7 @@ test:integration_slides:
     expire_in: 10 days
     when: on_failure
 
-test:gradle_4.9,4.10.2:
+test:gradle_7.0.2,7.1.1,7.3.3:
   stage: test
   image: $JDK11_TEST_IMAGE
   except:
@@ -136,43 +136,7 @@ test:gradle_4.9,4.10.2:
     expire_in: 10 days
     when: on_failure
 
-test:gradle_5.0,5.1.1,5.3.1:
-  stage: test
-  image: $JDK11_TEST_IMAGE
-  except:
-    - pages
-    - gh-pages
-    - tags
-  dependencies:
-    - testrepo
-    - jdk11
-  script: ./run-compatibility-test-on-ci.sh
-  artifacts:
-    paths:
-      - '*/build/reports'
-      - '*/build/jacoco'
-    expire_in: 10 days
-    when: on_failure
-
-test:gradle_5.4.1,5.5.1,5.6.4:
-  stage: test
-  image: $JDK12_TEST_IMAGE
-  except:
-    - pages
-    - gh-pages
-    - tags
-  dependencies:
-    - testrepo
-    - jdk11
-  script: ./run-compatibility-test-on-ci.sh
-  artifacts:
-    paths:
-      - '*/build/reports'
-      - '*/build/jacoco'
-    expire_in: 10 days
-    when: on_failure
-
-test:gradle_6.0.1:
+test:gradle_7.4.2,7.5.1:
   stage: test
   image: $JDK12_TEST_IMAGE
   except:

diff --git a/README.adoc b/README.adoc
@@ -49,6 +49,6 @@ The {doctitle} is the official means of using {asciidoctor-url}[Asciidoctor] to
 Documentation:: We are migrating our documentation to the new Asciidoctor Antora-based site when it is ready. In the meantime you can read a snapshot of the new documentation at {asciidoctor-development-docs}{github-branch}
 
 ifdef::env-github[]
-Structure:: `master` now represents the code for the latest 3.x release of these plugins. Development for for 3.x is against the link:https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/development-3.x[{github-branch}] branch. PRs are preferably taking against this branch. The 2.x & 1.5.x series of the plugin is now in maintenance only mode. PRs for that should be raised against the respective link:https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/maintenance-2.x[maintenance-2.x] and https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/maintenance-1.5[maintenance-1.5] branches.
+Structure:: `master` now represents the code for the latest 3.x release of these plugins. Development for for 4.x is against the link:https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/development-4.x[{github-branch}] branch. PRs are preferably taking against this branch. The 2.x & 1.5.x series of the plugin is now in maintenance only mode. PRs for that should be raised against the respective link:https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/maintenance-2.x[maintenance-2.x] and https://github.com/asciidoctor/asciidoctor-gradle-plugin/tree/maintenance-1.5[maintenance-1.5] branches.
 endif::[]
 
diff --git a/...c/main/groovy/org/asciidoctor/gradle/editorconfig/AsciidoctorEditorConfigGenerator.groovy b/...c/main/groovy/org/asciidoctor/gradle/editorconfig/AsciidoctorEditorConfigGenerator.groovy
@@ -29,7 +29,7 @@ import org.gradle.api.tasks.TaskAction
 
 import java.util.concurrent.Callable
 
-import static org.ysb33r.grolifant.api.MapUtils.stringizeValues
+import static org.ysb33r.grolifant.api.v4.MapUtils.stringizeValues
 
 /** Generates {@code .asciidoctorconfig} file.
  *

diff --git a/base/src/main/groovy/org/asciidoctor/gradle/base/AbstractAsciidoctorBaseTask.groovy b/base/src/main/groovy/org/asciidoctor/gradle/base/AbstractAsciidoctorBaseTask.groovy
@@ -46,8 +46,8 @@ import org.gradle.api.tasks.SkipWhenEmpty
 import org.gradle.api.tasks.util.PatternFilterable
 import org.gradle.api.tasks.util.PatternSet
 import org.gradle.util.GradleVersion
-import org.ysb33r.grolifant.api.FileUtils
-import org.ysb33r.grolifant.api.StringUtils
+import org.ysb33r.grolifant.api.v4.FileUtils
+import org.ysb33r.grolifant.api.v4.StringUtils
 
 import java.nio.file.Path
 import java.util.concurrent.Callable
@@ -58,7 +58,7 @@ import static org.asciidoctor.gradle.base.AsciidoctorUtils.executeDelegatingClos
 import static org.asciidoctor.gradle.base.AsciidoctorUtils.getSourceFileTree
 import static org.asciidoctor.gradle.base.AsciidoctorUtils.mapToDirectoryProvider
 import static org.gradle.api.tasks.PathSensitivity.RELATIVE
-import static org.ysb33r.grolifant.api.FileUtils.filesFromCopySpec
+import static org.ysb33r.grolifant.api.v4.FileUtils.filesFromCopySpec
 
 /** Abstract base task for Asciidoctor that can be shared between AsciidoctorJ and Asciidoctor.js.
  *

diff --git a/base/src/main/groovy/org/asciidoctor/gradle/base/AbstractDownloadableComponent.groovy b/base/src/main/groovy/org/asciidoctor/gradle/base/AbstractDownloadableComponent.groovy
@@ -20,8 +20,8 @@ import groovy.transform.CompileStatic
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.UnknownDomainObjectException
-import org.ysb33r.grolifant.api.git.AbstractCloudGit
-import org.ysb33r.grolifant.api.git.GitRepoArchiveDownloader
+import org.ysb33r.grolifant.api.v4.git.AbstractCloudGit
+import org.ysb33r.grolifant.api.v4.git.GitRepoArchiveDownloader
 
 import static org.asciidoctor.gradle.base.AsciidoctorUtils.executeDelegatingClosure
 

diff --git a/.../src/main/groovy/org/asciidoctor/gradle/base/AbstractImplementationEngineExtension.groovy b/.../src/main/groovy/org/asciidoctor/gradle/base/AbstractImplementationEngineExtension.groovy
@@ -18,9 +18,9 @@ package org.asciidoctor.gradle.base
 import groovy.transform.CompileStatic
 import org.gradle.api.Project
 import org.gradle.api.Task
-import org.ysb33r.grolifant.api.AbstractCombinedProjectTaskExtension
+import org.ysb33r.grolifant.api.v4.AbstractCombinedProjectTaskExtension
 
-import static org.ysb33r.grolifant.api.StringUtils.stringize
+import static org.ysb33r.grolifant.api.v4.StringUtils.stringize
 
 /** Base class for implementing extensions in the Asciidoctor Gradle suite.
  *
@@ -249,8 +249,8 @@ abstract class AbstractImplementationEngineExtension
         super(project)
         this.safeMode = SafeMode.UNSAFE
         this.attributes['gradle-project-name'] = project.name
-        this.attributes['gradle-project-group'] = { project.group ?: '' }
-        this.attributes['gradle-project-version'] = { project.version ?: '' }
+        this.attributes['gradle-project-group'] = projectOperations.groupProvider.orElse('')
+        this.attributes['gradle-project-version'] = projectOperations.versionProvider.orElse('')
         this.defaultVersionMap = ModuleVersionLoader.load(moduleResourceName)
     }
 

diff --git a/base/src/main/groovy/org/asciidoctor/gradle/base/AsciidoctorBasePlugin.groovy b/base/src/main/groovy/org/asciidoctor/gradle/base/AsciidoctorBasePlugin.groovy
@@ -24,7 +24,7 @@ import org.gradle.api.Task
 import org.gradle.api.UnknownTaskException
 import org.gradle.api.tasks.TaskContainer
 import org.gradle.api.tasks.diagnostics.DependencyReportTask
-import org.ysb33r.grolifant.api.TaskProvider
+import org.ysb33r.grolifant.api.v4.TaskProvider
 
 import java.util.regex.Matcher
 import java.util.regex.Pattern

diff --git a/base/src/main/groovy/org/asciidoctor/gradle/base/AsciidoctorUtils.groovy b/base/src/main/groovy/org/asciidoctor/gradle/base/AsciidoctorUtils.groovy
@@ -28,7 +28,7 @@ import org.gradle.api.provider.Provider
 import org.gradle.api.specs.Spec
 import org.gradle.api.tasks.util.PatternSet
 import org.gradle.util.GradleVersion
-import org.ysb33r.grolifant.api.OperatingSystem
+import org.ysb33r.grolifant.api.core.OperatingSystem
 
 import java.nio.file.Path
 

diff --git a/base/src/main/groovy/org/asciidoctor/gradle/base/GitHubArchive.groovy b/base/src/main/groovy/org/asciidoctor/gradle/base/GitHubArchive.groovy
@@ -20,7 +20,7 @@ package org.asciidoctor.gradle.base
  * @since 2.0
  */
 @SuppressWarnings('ClassNameSameAsSuperclass')
-class GitHubArchive extends org.ysb33r.grolifant.api.git.GitHubArchive {
+class GitHubArchive extends org.ysb33r.grolifant.api.v4.git.GitHubArchive {
 
     /** Relative path to locate the them inside the GitHub archive.
      *

diff --git a/base/src/main/groovy/org/asciidoctor/gradle/base/GitLabArchive.groovy b/base/src/main/groovy/org/asciidoctor/gradle/base/GitLabArchive.groovy
@@ -20,7 +20,7 @@ package org.asciidoctor.gradle.base
  * @since 2.0
  */
 @SuppressWarnings('ClassNameSameAsSuperclass')
-class GitLabArchive extends org.ysb33r.grolifant.api.git.GitLabArchive {
+class GitLabArchive extends org.ysb33r.grolifant.api.v4.git.GitLabArchive {
 
     /** Relative path to locate the them inside the GitLab archive.
      *

diff --git a/base/src/main/groovy/org/asciidoctor/gradle/base/ModuleVersionLoader.groovy b/base/src/main/groovy/org/asciidoctor/gradle/base/ModuleVersionLoader.groovy
@@ -16,7 +16,7 @@
 package org.asciidoctor.gradle.base
 
 import groovy.transform.CompileStatic
-import org.ysb33r.grolifant.api.MapUtils
+import org.ysb33r.grolifant.api.v4.MapUtils
 
 /** Loads the versions of Asciidoctor modules that are required for a specific plugin.
  *

diff --git a/base/src/main/groovy/org/asciidoctor/gradle/base/internal/ConfigurationUtils.groovy b/base/src/main/groovy/org/asciidoctor/gradle/base/internal/ConfigurationUtils.groovy
@@ -20,7 +20,7 @@ import org.asciidoctor.gradle.base.Transform
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.provider.Provider
-import org.ysb33r.grolifant.api.StringUtils
+import org.ysb33r.grolifant.api.v4.StringUtils
 
 /** Utilities for dealing with Configurations
  *

diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-    id 'com.gradle.build-scan' version '2.0.2'
+//    id 'com.gradle.build-scan' version '3.11.1'
     id 'com.jfrog.bintray' version '1.8.0' apply false
     id 'net.nemerosa.versioning' version '2.6.1' apply false
     id 'com.github.ben-manes.versions' version '0.17.0' apply false
@@ -25,24 +25,24 @@ plugins {
     id 'net.ossindex.audit' version '0.1.1' apply false
     id 'org.kordamp.jdeps' version '0.2.0' apply false
     id 'fi.linuxbox.download.worker' version '0.3' apply false
-    id 'org.ysb33r.ivypot' version '0.11' apply false
+    id 'org.ysb33r.ivypot' version '0.13.3' apply false
     id 'org.ysb33r.os' version '0.9' apply false
     id 'org.ysb33r.cloudci' version '2.5' apply false
     id 'org.ysb33r.cloudci.appveyor.testreporter' version '2.5' apply false
-    id 'org.ysb33r.gradletest' version '2.0-rc.4' apply false
+    id 'org.ysb33r.gradletest' version '2.0' apply false
     id 'idea'
 }
 
-buildScan {
-    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-    termsOfServiceAgree = 'yes'
-
-    buildFinished { buildResult ->
-        buildScanPublished { scan ->
-            ['curl', '-s', '-d', "message=asciidoctor-gradle-plugin build scan: ${scan.buildScanUri}", 'https://webhooks.gitter.im/e/6ba348eef26407adc22a'].execute()
-        }
-    }
-}
+//buildScan {
+//    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+//    termsOfServiceAgree = 'yes'
+//
+//    buildFinished { buildResult ->
+//        buildScanPublished { scan ->
+//            ['curl', '-s', '-d', "message=asciidoctor-gradle-plugin build scan: ${scan.buildScanUri}", 'https://webhooks.gitter.im/e/6ba348eef26407adc22a'].execute()
+//        }
+//    }
+//}
 
 
 import org.gradle.util.GradleVersion

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -5,13 +5,14 @@ plugins {
 apply from: 'gradle/load-gradle-properties.gradle'
 
 repositories {
-    jcenter()
+    mavenCentral()
     gradlePluginPortal()
 }
 
 dependencies {
-    compile localGroovy()
-    compile gradleApi()
-    compile "gradle.plugin.org.ysb33r.gradle:nodejs-gradle-plugin:${gradleProperties.nodejsGradleVersion}"
+    implementation localGroovy()
+    implementation gradleApi()
+    api "org.ysb33r.gradle:nodejs-gradle-plugin:${gradleProperties.nodejsGradleVersion}"
+    api "org.ysb33r.gradle:grolifant70:${gradleProperties.grolifantVersion}"
 }
 
diff --git a/gems/build.gradle b/gems/build.gradle
@@ -1,7 +1,7 @@
 
 dependencies {
-    compile "com.github.jruby-gradle:jruby-gradle-core-plugin:${jrubyGradleVersion}"
-    compile project(':asciidoctor-gradle-jvm')
+    implementation "com.github.jruby-gradle:jruby-gradle-core-plugin:${jrubyGradleVersion}"
+    api project(':asciidoctor-gradle-jvm')
 }
 
 test {
@@ -15,6 +15,9 @@ gradleTest {
         // Expecting external-gems to fail due to JRuby issue
         expectFailure ~/external-gems/
     }
+
+    gradleArguments '-d'
+
 }
 
 configurePlugin 'org.asciidoctor.jvm.gems',

diff --git a/gems/src/gradleTest/external-gems/build.gradle b/gems/src/gradleTest/external-gems/build.gradle
@@ -13,9 +13,8 @@ repositories {
 }
 
 dependencies {
-    asciidoctorGems 'rubygems:asciidoctor-bibtex:0.3.1'
-    asciidoctorGems 'rubygems:bibtex-ruby:4.4.7', {
-        force = true
+    asciidoctorGems 'rubygems:asciidoctor-bibtex:0.8.0', {
+        exclude module: 'asciidoctor'
     }
 }
 

diff --git a/...ovy/org/asciidoctor/gradle/jvm/gems/AsciidoctorGemPrepareTaskCachingFunctionalSpec.groovy b/...ovy/org/asciidoctor/gradle/jvm/gems/AsciidoctorGemPrepareTaskCachingFunctionalSpec.groovy
@@ -25,6 +25,8 @@ class AsciidoctorGemPrepareTaskCachingFunctionalSpec extends FunctionalSpecifica
     private static final String OUTPUT_DIR_PATH = 'build/.asciidoctorGems'
     private static final String DEFAULT_GEM_NAME = 'asciidoctor-revealjs'
     private static final String DEFAULT_GEM_VERSION = '2.0.0'
+    private static final String BIBTEX_GEM_NAME = 'asciidoctor-bibtex'
+    private static final String BIBTEX_GEM_VERSION = '0.8.0'
 
     void setup() {
         setupCache()
@@ -38,6 +40,7 @@ class AsciidoctorGemPrepareTaskCachingFunctionalSpec extends FunctionalSpecifica
                 asciidoctorGems("rubygems:${DEFAULT_GEM_NAME}:${DEFAULT_GEM_VERSION}") {
                     exclude module: 'asciidoctor'
                 }
+                asciidoctorGems("rubygems:${BIBTEX_GEM_NAME}:${BIBTEX_GEM_VERSION}")
             }
         """)
 

diff --git a/...rc/intTest/groovy/org/asciidoctor/gradle/jvm/gems/internal/FunctionalSpecification.groovy b/...rc/intTest/groovy/org/asciidoctor/gradle/jvm/gems/internal/FunctionalSpecification.groovy
@@ -19,7 +19,7 @@ import org.apache.commons.io.FileUtils
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
-import org.ysb33r.grolifant.api.OperatingSystem
+import org.ysb33r.grolifant.api.core.OperatingSystem
 import spock.lang.Specification
 
 class FunctionalSpecification extends Specification {

diff --git a/gems/src/main/groovy/org/asciidoctor/gradle/jvm/gems/AsciidoctorGemSupportPlugin.groovy b/gems/src/main/groovy/org/asciidoctor/gradle/jvm/gems/AsciidoctorGemSupportPlugin.groovy
@@ -23,9 +23,9 @@ import org.gradle.api.Action
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
-import org.ysb33r.grolifant.api.TaskProvider
+import org.ysb33r.grolifant.api.v4.TaskProvider
 
-import static org.ysb33r.grolifant.api.TaskProvider.registerTask
+import static org.ysb33r.grolifant.api.v4.TaskProvider.registerTask
 
 /** Plugin that simplifies that management of external GEMs.
  *

diff --git a/gradle.properties b/gradle.properties
@@ -16,11 +16,11 @@ bintray_dryRun = false
 cglibVersion           = 3.3.0
 jsoupVersion           = 1.13.1
 spockVersion           = 1.3-groovy-2.5
-grolifantVersion       = 0.16.1
+grolifantVersion       = 1.3.3
 jacocoVersion          = 0.8.6
 jrubyGradleVersion     = 2.0.2
 codenarcVersion        = 1.3
-nodejsGradleVersion    = 0.6.2
+nodejsGradleVersion    = 0.12.3
 
 org.gradle.daemon   = true
 org.gradle.parallel = true

diff --git a/gradle/compatibility-tests.gradle b/gradle/compatibility-tests.gradle
@@ -2,27 +2,14 @@ apply plugin: 'org.ysb33r.gradletest'
 
 pluginManager.withPlugin('org.ysb33r.cloudci') {
     ci {
-        travisci {
-            gradleTest {
-                if (JavaVersion.current().java11) {
-                    versions '4.9', '6.7'
-                } else {
-                    versions '4.9', '6.0.1'
-                }
-            }
-        }
         appveyor {
             gradleTest {
-                versions '4.9', '5.0', '5.6.4', '6.0.1', '6.7'
+                versions '7.0.2', '7.5.1'
             }
         }
         no_ci {
             gradleTest {
-                if (JavaVersion.current().java12) {
-                    versions '5.4.1', '6.0.1', '6.7'
-                } else {
-                    versions '4.9', '5.0', '5.5.1', '6.0.1', '6.7'
-                }
+                versions '7.0.2', '7.5.1'
             }
         }
     }
@@ -41,7 +28,7 @@ licenseGradleTest.enabled = false
 
 pluginManager.withPlugin('jacoco') {
     jacocoTestReport {
-        executionData gradleTest
-        mustRunAfter gradleTest
+        executionData 'gradleTest'
+        mustRunAfter 'gradleTest'
     }
 }