Merge pull request #3307 from 1c-syntax/develop

Author: nixel2007

.devcontainer/devcontainer.json

@@ -1 +1,38 @@
-{"image":"mcr.microsoft.com/devcontainers/universal:2"}
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/java
+{
+	"name": "Java",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/java:1-17-bookworm",
+
+	"features": {
+		"ghcr.io/devcontainers/features/java:1": {
+			"version": "none",
+			"installMaven": "false",
+			"installGradle": "true"
+		},
+		"ghcr.io/devcontainers/features/python:1": {}
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"vscjava.vscode-gradle",
+				"GitHub.vscode-github-actions",
+				"astrizhachuk.1c-extension-pack",
+				"zhuangtongfa.Material-theme"
+			]
+		}
+	}
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "java -version",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.github/dependabot.yml

@@ -9,7 +9,15 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    groups:
+      freefair:
+        patterns:
+          - "io.freefair.*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "devcontainers"
+    directory: "/"
+    schedule:
+      interval: weekly

.github/workflows/benchmark.yml

@@ -29,16 +29,17 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
+          cache: gradle
 
       - name: Build with Gradle
         run: ./gradlew bootJar
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.7"
 

.github/workflows/check-package.yml

@@ -31,13 +31,14 @@ jobs:
 
         steps:
             - name: Checkout source
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Set up JDK
-              uses: actions/setup-java@v3
+              uses: actions/setup-java@v4
               with:
-                java-version: 20
+                java-version: 21
                 distribution: 'temurin'
+                cache: gradle
 
             - name: Build bootJar with Gradle
               run: ./gradlew check build

.github/workflows/codeql-analysis.yml

@@ -23,21 +23,22 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
+        cache: gradle
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: java
@@ -52,4 +53,4 @@ jobs:
     - run: ./gradlew jar
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/gh-pages.yml

@@ -17,19 +17,20 @@ jobs:
   build-deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
+        cache: gradle
 
     - name: Build javadoc
       run: ./gradlew --no-daemon javadoc
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.7.15'
         architecture: 'x64'
@@ -145,7 +146,7 @@ jobs:
         cp -R temp/site/. public/dev/en
         
     - name: Deploy
-      uses: peaceiris/actions-gh-pages@v3.9.3
+      uses: peaceiris/actions-gh-pages@v4.0.0
       with:
         deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
         publish_branch: gh-pages

.github/workflows/gradle.yml

@@ -18,20 +18,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['17', '20']
+        java_version: ['17', '21']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java_version }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'temurin'
+        cache: gradle
     - name: Build with Gradle
       run: ./gradlew check --stacktrace
     - name: Archive test results
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
         path: build/reports/tests/test

.github/workflows/javadoc.yml

@@ -17,11 +17,12 @@ jobs:
     needs: gatekeeper
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
+        cache: gradle
     - name: Check javadoc build
       run: ./gradlew javadoc --stacktrace

.github/workflows/pre-qa.yml

@@ -21,7 +21,7 @@ jobs:
       run: echo ${{ github.event.number }} > PR_NUMBER.txt
     - name: Archive PR number
       if: github.event_name == 'pull_request'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: PR_NUMBER
         path: PR_NUMBER.txt

.github/workflows/publish-to-sonatype.yml

@@ -12,12 +12,13 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
+          cache: gradle
       - name: Publish to Sonatype
         run: ./gradlew publishMavenPublicationToSonatypeRepository -PsimplifyVersion
         env: