Merge branch 'main' into fix-space-before-separator-jackson

Author: nedtwigg

renovate.json .github/renovate.json5renovate.json renamed to .github/renovate.json5

@@ -1,14 +1,14 @@
 {
 	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
 	"extends": [
-		"config:base"
+		"config:recommended",
 	],
 	"packageRules": [
 		{
 			"groupName": "Ktlint",
 			"enabled": false,
-			"matchPackagePatterns": [
-				"com.pinterest.ktlint:*"
+			"matchPackageNames": [
+				"/com.pinterest.ktlint:*/",
 			]
 		}
 	]

.github/workflows/changelog-print.yml

@@ -9,14 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     name: changelogPrint
     steps:
-      - uses: actions/checkout@v4
-      - name: jdk 11
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew changelogPrint

.github/workflows/ci.yml

@@ -5,7 +5,7 @@
 on:
   pull_request:
   push:
-    branches: [main]
+    branches: [main, release]
   workflow_dispatch:
 
 concurrency:
@@ -20,18 +20,15 @@ jobs:
       buildcachepass: ${{ secrets.BUILDCACHE_PASS }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - name: Install JDK 11
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: "temurin"
-          java-version: 11
+          java-version: 21
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: spotlessCheck
         run: ./gradlew spotlessCheck
       - name: assemble testClasses
@@ -43,37 +40,30 @@ jobs:
       matrix:
         kind: [maven, gradle]
         # Test on the latest Java version once Gradle & Maven support it.
-        jre: [11, 17, 21, 22]
-        os: [ubuntu-latest]
+        jre: [17, 21, 24]
+        os: [ubuntu-latest, windows-latest]
         include:
-          # test windows at the diagonals of the above matrix
-          - kind: maven
-            jre: 11
-            os: windows-latest
-          - kind: gradle
-            jre: 17
-            os: windows-latest
           # npm on linux only (crazy slow on windows)
           - kind: npm
-            jre: 11
+            jre: 17
             os: ubuntu-latest
           - kind: shfmt
-            jre: 11
+            jre: 17
             os: ubuntu-latest
             shfmt-version: v3.8.0
+          - kind: idea
+            jre: 17
+            os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install JDK ${{ matrix.distribution }} ${{ matrix.java_version }}
-        uses: actions/setup-java@v4
+        uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jre }}
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: build (maven-only)
         if: matrix.kind == 'maven'
         run: ./gradlew :plugin-maven:build -x spotlessCheck
@@ -85,7 +75,7 @@ jobs:
         run: ./gradlew testNpm
       - name: Setup go
         if: matrix.kind == 'shfmt'
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: 'stable'
       - name: Install shfmt
@@ -95,8 +85,18 @@ jobs:
       - name: Test shfmt
         if: matrix.kind == 'shfmt'
         run: ./gradlew testShfmt
+      - name: Test idea
+        if: matrix.kind == 'idea'
+        run: |
+          download_link=$(curl https://data.services.jetbrains.com/products/releases\?code\=IIC\&latest\=true\&type\=release | jq -r '.IIC[0].downloads.linux.link')
+          curl --location "$download_link" -o idea.tar.gz
+          tar -xf idea.tar.gz
+          cd idea-IC*
+          export PATH=${PATH}:$(pwd)/bin
+          cd ..
+          ./gradlew testIdea
       - name: junit result
-        uses: mikepenz/action-junit-report@v4
+        uses: mikepenz/action-junit-report@v5
         if: always() # always run even if the previous step fails
         with:
           check_name: JUnit ${{ matrix.kind }} ${{ matrix.jre }} ${{ matrix.os }}

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

.github/workflows/deploy.yml

@@ -1,4 +1,3 @@
-# GH_TOKEN
 # NEXUS_USER
 # NEXUS_PASS64 (base64 NOTE: `base64` and `openssl base64` failed, had to use Java
 #   byte[] data = "{{password}}".getBytes(StandardCharsets.UTF_8);
@@ -29,23 +28,22 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: deploy
+    permissions:
+      contents: write
     env:
-      gh_token: ${{ secrets.GH_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }}
       ORG_GRADLE_PROJECT_nexus_pass64: ${{ secrets.NEXUS_PASS64 }}
       ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
       ORG_GRADLE_PROJECT_gpg_key64: ${{ secrets.GPG_KEY64 }}
     steps:
-      - uses: actions/checkout@v4
-      - name: jdk 11
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
-          java-version: 11
+          java-version: 21
           distribution: 'temurin'
       - name: gradle caching
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
       - name: git fetch origin main
         run: git fetch origin main
       - name: publish all

.github/workflows/gradle-wrapper-validation.yml

@@ -7,6 +7,7 @@
 # Project-specific stuff
 userHome/
 workspace/
+testenv.properties
 
 ### Gradle ###
 .gradle
@@ -67,6 +68,7 @@ local.properties
 
 ## Directory-based project format:
 .idea/
+!.idea/icon.png
 # if you remove the above rule, at least ignore the following:
 
 # User-specific stuff: