Bump eslint-config-prettier from 8.10.0 to 10.1.8

Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 8.10.0 to 10.1.8. - [Release notes](https://github.com/prettier/eslint-config-prettier/releases) - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v8.10.0...v10.1.8) --- updated-dependencies: - dependency-name: eslint-config-prettier dependency-version: 10.1.8 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2025-11-06 02:26:25 +08:00 · 2025-09-18 07:14:23 +00:00
6 changed files with 130 additions and 227 deletions
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@@ -41,15 +41,6 @@ jobs:
          - distribution: dragonwell
            os: macos-13
        include:
-          - distribution: microsoft
-            os: windows-latest
-            version: 25
-          - distribution: microsoft
-            os: ubuntu-latest
-            version: 25
-          - distribution: microsoft
-            os: macos-latest
-            version: 25
          - distribution: oracle
            os: macos-13
            version: 17
--- a/tests/data/microsoft.json
+++ b/tests/data/microsoft.json
@@ -1,47 +1,4 @@
 [
-    {
-      "version": "25.0.0",
-      "stable": true,
-      "release_url": "https://aka.ms/download-jdk",
-      "files": [
-        {
-          "filename": "microsoft-jdk-25.0.0-macos-x64.tar.gz",
-          "arch": "x64",
-          "platform": "darwin",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-x64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-25.0.0-linux-x64.tar.gz",
-          "arch": "x64",
-          "platform": "linux",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-x64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-25.0.0-windows-x64.zip",
-          "arch": "x64",
-          "platform": "win32",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-x64.zip"
-        },
-        {
-          "filename": "microsoft-jdk-25.0.0-macos-aarch64.tar.gz",
-          "arch": "aarch64",
-          "platform": "darwin",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-aarch64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-25.0.0-linux-aarch64.tar.gz",
-          "arch": "aarch64",
-          "platform": "linux",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-aarch64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-25.0.0-windows-aarch64.zip",
-          "arch": "aarch64",
-          "platform": "win32",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-aarch64.zip"
-        }
-      ]
-    },
    {
      "version": "21.0.0",
      "stable": true,
--- a/tests/distributors/microsoft-installer.test.ts
+++ b/tests/distributors/microsoft-installer.test.ts
@@ -29,11 +29,6 @@ describe('findPackageForDownload', () => {
  });

  it.each([
-    [
-      '25.x',
-      '25.0.0',
-      'https://aka.ms/download-jdk/microsoft-jdk-25.0.0-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
-    ],
    [
      '21.x',
      '21.0.0',
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,4 +1,3 @@
-
 {
  "name": "setup-java",
  "version": "5.0.0",
@@ -28,7 +27,7 @@
        "@typescript-eslint/parser": "^8.35.1",
        "@vercel/ncc": "^0.38.1",
        "eslint": "^8.57.0",
-        "eslint-config-prettier": "^8.6.0",
+        "eslint-config-prettier": "^10.1.8",
        "eslint-plugin-jest": "^29.0.1",
        "eslint-plugin-node": "^11.1.0",
        "jest": "^29.7.0",
@@ -2797,13 +2796,17 @@
      }
    },
    "node_modules/eslint-config-prettier": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
-      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
+      "version": "10.1.8",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz",
+      "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
      "dev": true,
+      "license": "MIT",
      "bin": {
        "eslint-config-prettier": "bin/cli.js"
      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-config-prettier"
+      },
      "peerDependencies": {
        "eslint": ">=7.0.0"
      }
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
    "@typescript-eslint/parser": "^8.35.1",
    "@vercel/ncc": "^0.38.1",
    "eslint": "^8.57.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-prettier": "^10.1.8",
    "eslint-plugin-jest": "^29.0.1",
    "eslint-plugin-node": "^11.1.0",
    "jest": "^29.7.0",
--- a/src/distributions/microsoft/microsoft-openjdk-versions.json
+++ b/src/distributions/microsoft/microsoft-openjdk-versions.json
@@ -1,133 +1,90 @@
 [
  {
-    "version": "25.0.0",
-    "stable": true,
-    "release_url": "https://aka.ms/download-jdk",
-    "files": [
-      {
-        "filename": "microsoft-jdk-25.0.0-macos-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-25.0.0-linux-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-25.0.0-windows-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-x64.zip"
-      },
-      {
-        "filename": "microsoft-jdk-25.0.0-macos-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-25.0.0-linux-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-25.0.0-windows-aarch64.zip",
-        "arch": "aarch64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-aarch64.zip"
-      }
-    ]
-  },
+  "version": "21.0.2",
+  "stable": true,
+  "release_url": "https://aka.ms/download-jdk",
+  "files": [
+    {
+      "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
+      "arch": "x64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
+      "arch": "x64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
+      "arch": "x64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
+      "arch": "aarch64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
+    }
+  ]
+},
  {
-    "version": "21.0.2",
-    "stable": true,
-    "release_url": "https://aka.ms/download-jdk",
-    "files": [
-      {
-        "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
-        "arch": "aarch64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
-      }
-    ]
-  },
-  {
-    "version": "21.0.1",
-    "stable": true,
-    "release_url": "https://aka.ms/download-jdk",
-    "files": [
-      {
-        "filename": "microsoft-jdk-21.0.1-macos-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-linux-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-windows-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-x64.zip"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-macos-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-linux-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-windows-aarch64.zip",
-        "arch": "aarch64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-aarch64.zip"
-      }
-    ]
-  },
+  "version": "21.0.1",
+  "stable": true,
+  "release_url": "https://aka.ms/download-jdk",
+  "files": [
+    {
+      "filename": "microsoft-jdk-21.0.1-macos-x64.tar.gz",
+      "arch": "x64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.1-linux-x64.tar.gz",
+      "arch": "x64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.1-windows-x64.zip",
+      "arch": "x64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-x64.zip"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.1-macos-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.1-linux-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.1-windows-aarch64.zip",
+      "arch": "aarch64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-aarch64.zip"
+    }
+  ]
+},
  {
    "version": "21.0.0",
    "stable": true,
@@ -219,42 +176,42 @@
    "stable": true,
    "release_url": "https://aka.ms/download-jdk",
    "files": [
-      {
-        "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-17.0.9-linux-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-17.0.9-windows-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-x64.zip"
-      },
-      {
-        "filename": "microsoft-jdk-17.0.9-macos-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-17.0.9-linux-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-17.0.9-windows-aarch64.zip",
-        "arch": "aarch64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
-      }
+    {
+      "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
+      "arch": "x64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-17.0.9-linux-x64.tar.gz",
+      "arch": "x64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-17.0.9-windows-x64.zip",
+      "arch": "x64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-x64.zip"
+    },
+    {
+      "filename": "microsoft-jdk-17.0.9-macos-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-17.0.9-linux-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-17.0.9-windows-aarch64.zip",
+      "arch": "aarch64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
+    }
    ]
  },
  {
@@ -878,4 +835,4 @@
      }
    ]
  }
-]
+]