Merge branch 'main' into renovate/less-plugin-clean-css-1.x

Reviewed-on: #471

.editorconfig

@@ -10,8 +10,8 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.{java,skin}]
+indent_size = 3
+
 [*.md]
 trim_trailing_whitespace = false
-
-[*.{java}]
-indent_size = 3

.github/workflows/renovate.yml

@@ -1,10 +1,9 @@
 name: Run Renovate
 
-#on: workflow_dispatch
-
 on:
   schedule:
     - cron: "42 * * * *"
+  workflow_dispatch:
 
 jobs:
   renovate:
@@ -14,28 +13,28 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run Renovate
-        run: npx renovate
+        # See <https://docs.renovatebot.com/troubleshooting/#log-debug-levels>
+        # debug | info | warn | error | fatal
+        run: LOG_LEVEL=info npx renovate
         env:
           # Renovate is using this token to retrieve release notes
           GITHUB_COM_TOKEN: ${{ secrets.renovate_github_com_token }}
-          # See <https://docs.renovatebot.com/troubleshooting/#log-debug-levels>
-          LOG_LEVEL: info # debug | info | warn | error | fatal
-          RENOVATE_AUTODISCOVER: 'true'
           RENOVATE_CONFIG_FILE: renovate.json
           RENOVATE_ENDPOINT: ${{ github.api_url }}
           RENOVATE_GIT_AUTHOR: Renovate Bot <mail+renovate@antville.org>
-          #RENOVATE_GIT_IGNORED_AUTHORS: 
-          #  - 29139614+renovate[bot]@users.noreply.github.com
           RENOVATE_IGNORE_PR_AUTHOR: 'true'
           RENOVATE_LOG_FILE: renovate-log.ndjson
           RENOVATE_LOG_FILE_LEVEL: debug
           RENOVATE_PLATFORM: gitea
+          RENOVATE_REPOSITORIES: ${{ github.repository }}
           RENOVATE_REPOSITORY_CACHE: 'enabled'
           # github.token is not working here, it lacks some permissions required by Renovate
-          RENOVATE_TOKEN: ${{ secrets.renovate_token }} #${{ github.token }}
+          RENOVATE_TOKEN: ${{ secrets.renovate_token }}
 
       - name: Save log file
+        # FIXME: v4 of this action causes an error on Forgejo (“You must configure a GitHub token”)
         uses: actions/upload-artifact@v3
+        if: always()
         with:
           name: renovate-log.ndjson
           path: renovate-log.ndjson

build.gradle

@@ -1,7 +1,7 @@
 plugins {
   id 'base'
   id 'java'
-  id 'com.github.node-gradle.node' version '7.0.1'
+  id 'com.github.node-gradle.node' version '7.1.0'
 }
 
 tasks.build.dependsOn 'assemble'
@@ -43,11 +43,11 @@ allprojects {
 version = distVersion()
 
 dependencies {
-  implementation 'org.commonmark:commonmark:0.21.0'
+  implementation 'org.commonmark:commonmark:0.24.0'
-  implementation 'org.commonmark:commonmark-ext-autolink:0.21.0'
+  implementation 'org.commonmark:commonmark-ext-autolink:0.24.0'
-  implementation 'org.commonmark:commonmark-ext-gfm-strikethrough:0.21.0'
+  implementation 'org.commonmark:commonmark-ext-gfm-strikethrough:0.24.0'
-  implementation 'org.commonmark:commonmark-ext-gfm-tables:0.21.0'
+  implementation 'org.commonmark:commonmark-ext-gfm-tables:0.24.0'
-  implementation 'org.jsoup:jsoup:1.17.2'
+  implementation 'org.jsoup:jsoup:1.18.3'
   implementation 'rome:rome:1.0'
 
   implementation('org.lesscss:lesscss:1.7.0.1.1') {

code/Global/Global.js

@@ -22,7 +22,7 @@
 String.ELLIPSIS = '…';
 
 app.addRepository(app.dir + '/../lib/jdom-1.0.jar');
-app.addRepository(app.dir + '/../lib/jsoup-1.17.2.jar');
+app.addRepository(app.dir + '/../lib/jsoup-1.18.3.jar');
 app.addRepository(app.dir + '/../lib/lesscss-1.7.0.1.1.jar');
 app.addRepository(app.dir + '/../lib/rome-1.0.jar');
 

code/Global/markdown.js

@@ -1,8 +1,8 @@
-app.addRepository(app.dir + '/../lib/autolink-0.10.0.jar');
+app.addRepository(app.dir + '/../lib/autolink-0.11.0.jar');
-app.addRepository(app.dir + '/../lib/commonmark-0.21.0.jar');
+app.addRepository(app.dir + '/../lib/commonmark-0.24.0.jar');
-app.addRepository(app.dir + '/../lib/commonmark-ext-autolink-0.21.0.jar');
+app.addRepository(app.dir + '/../lib/commonmark-ext-autolink-0.24.0.jar');
-app.addRepository(app.dir + '/../lib/commonmark-ext-gfm-strikethrough-0.21.0.jar');
+app.addRepository(app.dir + '/../lib/commonmark-ext-gfm-strikethrough-0.24.0.jar');
-app.addRepository(app.dir + '/../lib/commonmark-ext-gfm-tables-0.21.0.jar');
+app.addRepository(app.dir + '/../lib/commonmark-ext-gfm-tables-0.24.0.jar');
 
 var renderMarkdown = (function() {
   const commonMark = new JavaImporter(

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

tools/antclick/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-  id 'com.github.jk1.dependency-license-report' version '2.5'
+  id 'com.github.jk1.dependency-license-report' version '2.9'
 }
 
 def helmaInstallDir = "${rootProject.buildDir}/install/antclick"