Merge pull request #1087 from ndw/gradle87

Infrastructure updates

.github/workflows/build-pr.yml

@@ -13,7 +13,7 @@ jobs:
       tag: ${{ steps.check_step.outputs.tag }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -50,7 +50,7 @@ jobs:
       # (if it previously published anything)
 
       - name: Checkout the pull request
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
@@ -63,7 +63,7 @@ jobs:
           done
 
       - name: Checkout the repository base
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Update the XML
         run: rsync -var /tmp/pr-sources/ ./

.github/workflows/build-specs.yml

@@ -9,7 +9,7 @@ jobs:
       tag: ${{ steps.check_step.outputs.tag }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -18,18 +18,18 @@ jobs:
         run: |
           raw=${{ github.repository }}
           reponame=${raw##*/}
-          echo "::set-output name=reponame::$reponame"
+          echo "reponame=$reponame" >> $GITHUB_STATE
           raw=$(git branch -r --contains ${{ github.ref }})
           branch=${raw##*/}
-          echo "::set-output name=branch::$branch"
+          echo "branch=$branch" >> $GITHUB_STATE
           tag=""
           if [ ${{ github.ref_type }} = "tag" ]; then
             tag=${{ github.ref_name }}
             echo "Running in $reponame on $branch for $tag"
           else
             echo "Running in $reponame on $branch"
           fi
-          echo "::set-output name=tag::$tag"
+          echo "tag=$tag" >> $GITHUB_STATE
 
   build-and-deploy:
     runs-on: ubuntu-latest
@@ -50,7 +50,7 @@ jobs:
       # happens from two repositories. We must preserve what we
       # don’t change by getting the current version
       - name: Checkout current gh-pages
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: gh-pages
           path: build/dist
@@ -63,7 +63,7 @@ jobs:
           fi
 
       - name: Checkout this repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Restore the relevant gh-pages
         run: |

build.gradle

@@ -24,7 +24,7 @@ buildscript {
 }
 
 plugins {
-  id "de.undercouch.download" version "4.0.4"
+  id "de.undercouch.download" version "5.6.0"
   id "groovy"
 }
 
@@ -102,7 +102,7 @@ task spec_rng(type: JavaExec) {
   outputs.file "build/schema/dbspec.rng"
 
   classpath = configurations.tools
-  main = 'com.thaiopensource.relaxng.translate.Driver'
+  mainClass = 'com.thaiopensource.relaxng.translate.Driver'
   args = ["schema/dbspec.rnc", "build/schema/dbspec.rng"]
   doFirst {
     mkdir("build/schema")
@@ -166,7 +166,7 @@ stepList.each { step ->
   Task t = task "${taskname}"(type: Download) {
     src "$stepsBaseUri/$step/toc.xml"
     dest "$buildDir/$step/toc.xml"
-    doFirst { mkdir "$buildDir" }
+    doFirst { mkdir "$buildDir/$step" }
   }
   t.onlyIf { ! file("$buildDir/$step/toc.xml".toString()).exists() }
   spec_schemas.dependsOn t

buildSrc/src/main/groovy/com/nwalsh/tasks/StripAmblesTask.groovy

@@ -4,7 +4,6 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.incremental.IncrementalTaskInputs
 
 // ================================================================================
 // Strip pre-amble and post-amble from examples so that the example on disk
@@ -20,7 +19,7 @@ class StripAmblesTask extends DefaultTask {
     def File output
 
     @TaskAction
-    void execute(IncrementalTaskInputs inputs) {
+    void execute() {
       def lines = input.readLines()
       def firstBlank = -1;
       def lastBlank = -1;

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -1,3 +1,2 @@
-include 'overview', 'xproc', 'steps', 'steps-intro', 'step-validation',
-        'step-os', 'step-paged-media', 'step-run',
-        'step-file', 'step-text'
+rootProject.name = "specification"
+include 'overview', 'xproc'