Merge branch 'main' into dependabot/npm_and_yarn/flatted-3.4.2

Author: robstryker

.eslintignore

@@ -6,7 +6,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: mschilde/auto-label-merge-conflicts@8c6faa8a252e35ba5e15703b3d747bf726cdb95c
+      - uses: mschilde/auto-label-merge-conflicts@cd484bbf0476fbe79474a937681a253e094cac3d
         with:
           CONFLICT_LABEL_NAME: "has conflicts"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.eslintrc.json

@@ -18,7 +18,7 @@ jobs:
       - name: Set Up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'temurin'
       - run: npm install -g typescript "@vscode/vsce"
       - run: wget http://download.eclipse.org/jdtls/snapshots/jdt-language-server-latest.tar.gz

.github/workflows/conflictDetector.yaml

@@ -81,7 +81,7 @@ jobs:
       - name: Set Up Java
         uses: actions/setup-java@v5
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'temurin'
       - name: Build JDT-LS
         if: "${{ inputs.JDT_LS_VERSION == '' }}"
@@ -140,7 +140,7 @@ jobs:
           # Package for each platform (only downloads JDK and creates VSIX, no recompilation)
           platforms=("win32-x64" "win32-arm64" "linux-x64" "linux-arm64" "darwin-x64" "darwin-arm64")
           for platform in ${platforms[@]}; do
-            npm run download-jre -- --target ${platform} --javaVersion 21
+            npm run download-jre -- --target ${platform} --javaVersion 25
             SKIP_WEBPACK=true vsce package ${{ env.publishPreReleaseFlag }} --target ${platform} -o java-${platform}-${{ env.EXT_VERSION }}-${GITHUB_RUN_NUMBER}.vsix
           done
 

.github/workflows/pr-verify.yml

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=21.0.5-tem
+java=25.0.2-tem

.github/workflows/release.yml

@@ -6,7 +6,7 @@
     "search.exclude": {
         "out": true // set this to false to include "out" folder in search results
     },
-    "typescript.tsdk": "./node_modules/typescript/lib",
+    "js/ts.tsdk.path": "./node_modules/typescript/lib",
     "git.alwaysSignOff": true,
     "vsicons.presets.angular": false // we want to use the TS server from our node_modules folder to control its version
 }