Upgrade Gradle Wrapper to 8.13, address deprecation warnings

Author: mrotteveel

build.gradle

@@ -44,8 +44,8 @@ docConfig {
 }
 
 def asciidocHtml = tasks.register('asciidocHtml', FbAsciidocHtmlTask) {
-    group 'Documentation'
-    description 'Generate HTML documentation from asciidoc'
+    group = 'Documentation'
+    description = 'Generate HTML documentation from asciidoc'
     baseDirFollowsSourceFile()
     executionMode = OUT_OF_PROCESS
     attributes 'revnumber': false, 'stylesdir': file(stylesDir), 'stylesheet': 'firebird.css',
@@ -73,13 +73,13 @@ def asciidocHtml = tasks.register('asciidocHtml', FbAsciidocHtmlTask) {
 }
 
 def asciidocPdf = tasks.register('asciidocPdf', FbAsciidocPdfTask) {
-    group 'Documentation'
-    description 'Generate PDF documentation from asciidoc'
+    group = 'Documentation'
+    description = 'Generate PDF documentation from asciidoc'
     baseDirFollowsSourceFile()
     executionMode = OUT_OF_PROCESS
     attributes 'revnumber': false, 'source-highlighter': 'rouge', 'media': 'screen', 'toc': 'macro', 'compress': '',
             'icon-set': 'fas', 'pdf-fontsdir': "${file('src/theme/fonts')},GEM_FONTS_DIR"
-    theme 'firebird'
+    theme = 'firebird'
     asciidoctorj {
         modules {
             pdf {
@@ -112,8 +112,8 @@ def copyDocbook5Js = tasks.register('copyDocbook5Js', Copy) {
 
 def asciidocDocbook = tasks.register('asciidocDocbook', AsciidocToDocbook) {
     dependsOn copyXsltNgCustomizations, copyDocbook5Css, copyDocbook5Js
-    group 'Documentation'
-    description 'Generate Docbook from asciidoc'
+    group = 'Documentation'
+    description = 'Generate Docbook from asciidoc'
 
     baseDirFollowsSourceFile()
     executionMode = OUT_OF_PROCESS
@@ -141,8 +141,9 @@ def asciidocDocbook = tasks.register('asciidocDocbook', AsciidocToDocbook) {
     }
 }
 
-task docbookHtml(type: DocbookHtml, group: 'documentation') {
-    description 'Generate chunked HTML documentation'
+tasks.register('docbookHtml', DocbookHtml) {
+    group = 'documentation'
+    description = 'Generate chunked HTML documentation'
     stylesheetBaseName.set('html')
     outputTypeName.set('html')
     imageExcludes.addAll(
@@ -151,8 +152,9 @@ task docbookHtml(type: DocbookHtml, group: 'documentation') {
     extraFilesToOutput.set(files('src/docs/firebirddocs.css'))
 }
 
-task docbookMonohtml(type: DocbookHtml, group: 'documentation') {
-    description 'Generate single file HTML documentation'
+tasks.register('docbookMonohtml', DocbookHtml) {
+    group = 'documentation'
+    description = 'Generate single file HTML documentation'
     stylesheetBaseName.set('monohtml')
     outputTypeName.set('monohtml')
     imageExcludes.addAll(
@@ -164,14 +166,14 @@ task docbookMonohtml(type: DocbookHtml, group: 'documentation') {
 def docbookFoTask = tasks.register('docbookFo', DocbookFo)
 def docbookPdfTask = tasks.register('docbookPdf', FoTask)
 docbookPdfTask.configure { fo2pdf ->
-    fo2pdf.group 'documentation'
-    fo2pdf.description 'Generate PDF documentation from FO file'
+    fo2pdf.group = 'documentation'
+    fo2pdf.description = 'Generate PDF documentation from FO file'
     fo2pdf.inputFoFile.set(docbookFoTask.get().mainOutputFile)
     fo2pdf.dependsOn docbookFoTask
 }
 docbookFoTask.configure { docbookFo ->
-    docbookFo.group 'documentation'
-    docbookFo.description 'Generate FO documentation'
+    docbookFo.group = 'documentation'
+    docbookFo.description = 'Generate FO documentation'
     docbookFo.stylesheetBaseName.set('fo')
     docbookFo.outputTypeName.set('fo')
     docbookFo.imageExcludes.addAll(
@@ -185,16 +187,18 @@ docbookFoTask.configure { docbookFo ->
     docbookFo.configureWith(docbookPdfTask.get())
 }
 
-task "tt-fo"(type: XsltTask, group: "tools") {
-    description 'Generates fo/titlepage.templates.xsl from fo/titlepage.templates.xml'
+tasks.register('tt-fo', XsltTask) {
+    group = 'tools'
+    description = 'Generates fo/titlepage.templates.xsl from fo/titlepage.templates.xml'
     inputFile.set(docConfig.styleDir.file('fo/titlepage.templates.xml'))
     styleSheetUri.set('template/titlepage.xsl')
     stylesheetBase.set('http://docbook.sourceforge.net/release/xsl/current/')
     outputFile.set(docConfig.styleDir.file('fo/titlepage.templates.xsl'))
 }
 
-task "tt-html"(type: XsltTask, group: "tools") {
-    description 'Generates html/titlepage.templates.xsl from html/titlepage.templates.xml'
+tasks.register('tt-html', XsltTask) {
+    group = 'tools'
+    description = 'Generates html/titlepage.templates.xsl from html/titlepage.templates.xml'
     inputFile.set(docConfig.styleDir.file('html/titlepage.templates.xml'))
     styleSheetUri.set('template/titlepage.xsl')
     stylesheetBase.set('http://docbook.sourceforge.net/release/xsl/current/')

buildSrc/build.gradle

@@ -16,11 +16,11 @@ repositories {
     mavenCentral()
     // To resolve jai-code and jai-core
     maven {
-        url 'https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/'
+        url = 'https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/'
     }
     // 'repository' for getting docbook xsd
     ivy {
-        url 'https://docbook.org/xml'
+        url = 'https://docbook.org/xml'
         patternLayout {
             artifact '[revision]/[module]-[revision].[ext]'
         }
@@ -33,7 +33,7 @@ repositories {
     }
     // 'repository' for getting additional dependencies not available from Maven
     ivy {
-        url 'https://www.firebirdsql.org/doclibs/'
+        url = 'https://www.firebirdsql.org/doclibs/'
         patternLayout {
             artifact '[module].[ext]'
         }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.