diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index 13415582..b26a4439 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -107,34 +107,34 @@ jobs: include: - directory: 'tests/dotnet' os: 'ubuntu-latest' - arguments: '-l,jetbrains/qodana-cdnet:2025.1-eap' + arguments: '-l,jetbrains/qodana-cdnet:2025.2-eap' pr: 'false' # TODO: add true when pr-mode is available for dotnet-community # - directory: 'tests/cpp' -# arguments: '-l,jetbrains/qodana-clang:2025.1-eap' +# arguments: '-l,jetbrains/qodana-clang:2025.2-eap' # os: 'ubuntu-latest' # pr: 'false' - directory: 'tests/java' - arguments: '-l,jetbrains/qodana-jvm-community:2025.1' + arguments: '-l,jetbrains/qodana-jvm-community:2025.2' os: 'ubuntu-latest' pr: 'true' - directory: 'tests/java' - arguments: '-l,jetbrains/qodana-jvm-community:2025.1' + arguments: '-l,jetbrains/qodana-jvm-community:2025.2' os: 'ubuntu-latest' pr: 'false' - directory: 'tests/java' - arguments: '-l,jetbrains/qodana-jvm-android:2025.1' + arguments: '-l,jetbrains/qodana-jvm-android:2025.2' os: 'ubuntu-latest' pr: 'true' - directory: 'tests/java' - arguments: '-l,jetbrains/qodana-jvm-android:2025.1' + arguments: '-l,jetbrains/qodana-jvm-android:2025.2' os: 'ubuntu-latest' pr: 'false' - directory: 'tests/py_error' - arguments: '-l,jetbrains/qodana-python-community:2025.1' + arguments: '-l,jetbrains/qodana-python-community:2025.2' os: 'ubuntu-latest' pr: 'true' - directory: 'tests/py_error' - arguments: '-l,jetbrains/qodana-python-community:2025.1' + arguments: '-l,jetbrains/qodana-python-community:2025.2' os: 'ubuntu-latest' pr: 'false' - directory: 'tests/dotnet' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13c25586..248505e4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -134,7 +134,7 @@ Apply Gradle Qodana Plugin with snapshot version in Gradle configuration file an ```groovy plugins { - id "org.jetbrains.qodana" version "2025.1.1-SNAPSHOT" + id "org.jetbrains.qodana" version "2025.2.1-SNAPSHOT" } qodana { @@ -145,7 +145,7 @@ Apply Gradle Qodana Plugin with snapshot version in Gradle configuration file an ```kotlin plugins { - id("org.jetbrains.qodana") version "2025.1.1-SNAPSHOT" + id("org.jetbrains.qodana") version "2025.2.1-SNAPSHOT" } qodana { diff --git a/GRADLE.md b/GRADLE.md index 6b1f7894..dd4d463d 100644 --- a/GRADLE.md +++ b/GRADLE.md @@ -23,7 +23,7 @@ Apply Gradle plugin `org.jetbrains.qodana` in the Gradle configuration file: ```groovy plugins { - id "org.jetbrains.qodana" version "2025.1.1" + id "org.jetbrains.qodana" version "2025.2.1" } ``` @@ -31,7 +31,7 @@ Apply Gradle plugin `org.jetbrains.qodana` in the Gradle configuration file: ```kotlin plugins { - id("org.jetbrains.qodana") version "2025.1.1" + id("org.jetbrains.qodana") version "2025.2.1" } ``` @@ -64,7 +64,7 @@ Add this to your Gradle configuration file: ```groovy plugins { // applies Gradle Qodana plugin to use it in project - id "org.jetbrains.qodana" version "2025.1.1" + id "org.jetbrains.qodana" version "2025.2.1" } qodana { @@ -82,7 +82,7 @@ Add this to your Gradle configuration file: ```kotlin plugins { // applies Gradle Qodana plugin to use it in project - id("org.jetbrains.qodana") version "2025.1.1" + id("org.jetbrains.qodana") version "2025.2.1" } qodana { diff --git a/README.md b/README.md index b9f29065..8a6d3db0 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit fetch-depth: 0 # a full history is required for pull request analysis - name: 'Qodana Scan' - uses: JetBrains/qodana-action@v2025.1 + uses: JetBrains/qodana-action@v2025.2 env: QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} # read the steps about it below ``` @@ -96,7 +96,7 @@ Example configuration: ```yaml - name: Qodana Scan - uses: JetBrains/qodana-action@v2025.1 + uses: JetBrains/qodana-action@v2025.2 with: pr-mode: false args: --apply-fixes @@ -136,7 +136,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - name: 'Qodana Scan' - uses: JetBrains/qodana-action@v2025.1 + uses: JetBrains/qodana-action@v2025.2 with: args: --cleanup - run: | @@ -272,8 +272,8 @@ with: | `artifact-name` | Specify Qodana results artifact name, used for results uploading. Optional. | `qodana-report` | | `cache-dir` | Directory to store Qodana cache. Optional. | `${{ runner.temp }}/qodana/caches` | | `use-caches` | Utilize [GitHub caches](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy) for Qodana runs. Optional. | `true` | -| `primary-cache-key` | Set [the primary cache key](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#matching-a-cache-key). Optional. | `qodana-2025.1-${{ github.ref }}-${{ github.sha }}` | -| `additional-cache-key` | Set [the additional cache key](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#matching-a-cache-key). Optional. | `qodana-2025.1-${{ github.ref }}` | +| `primary-cache-key` | Set [the primary cache key](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#matching-a-cache-key). Optional. | `qodana-2025.2-${{ github.ref }}-${{ github.sha }}` | +| `additional-cache-key` | Set [the additional cache key](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#matching-a-cache-key). Optional. | `qodana-2025.2-${{ github.ref }}` | | `cache-default-branch-only` | Upload cache for the default branch only. Optional. | `false` | | `use-annotations` | Use annotation to mark the results in the GitHub user interface. Optional. | `true` | | `pr-mode` | Analyze ONLY changed files in a pull request. Optional. | `true` | diff --git a/action.yaml b/action.yaml index bf276959..12ce37d2 100644 --- a/action.yaml +++ b/action.yaml @@ -24,11 +24,11 @@ inputs: primary-cache-key: description: 'Set the primary cache key' required: false - default: "qodana-2025.1-${{ github.ref }}-${{ github.sha }}" + default: "qodana-2025.2-${{ github.ref }}-${{ github.sha }}" additional-cache-key: description: 'Set the additional cache key' required: false - default: "qodana-2025.1-${{ github.ref }}" + default: "qodana-2025.2-${{ github.ref }}" cache-default-branch-only: description: 'Upload cache for the default branch only' required: false diff --git a/common/cli.json b/common/cli.json index 68dff444..0b57a31b 100644 --- a/common/cli.json +++ b/common/cli.json @@ -1,11 +1,11 @@ { - "version": "2025.1.1", + "version": "2025.2.1", "checksum": { - "windows_x86_64": "9b6b30b295b1cc0e60c2be04f4f0054d19a35b79e13c3544c054c1bd052da164", - "linux_arm64": "656527c02c9a12351949f96064a9599c591de2eec856d218f23ad0ea49445602", - "darwin_arm64": "c2e365bb218413fcef4279463823d42ebce8472d12ecff0ad4266d5ad26e0cdc", - "darwin_x86_64": "81cd002d9fcc560596ac35172ccea6958f1645030fde8111c628b98391d16761", - "windows_arm64": "fb474395342443afa57eb9fa019544a487119b4e418cec1b823bbf238bd9e85f", - "linux_x86_64": "785dac6b5e1d78f96b20e9ba5600590c1779d5b6daa9d57c003430adb27377e2" + "windows_x86_64": "134b8248ce23b7e471cdc32c1a917011f510bba9f5bf0ca5be32afcc86bc9547", + "linux_arm64": "efabe2eb9ec8a1e9794f0fe3e0a0ebf1ce7a20105dedd6baf0161503e84a438d", + "darwin_arm64": "43a92cc573a425a5ce305f61c675acc75f6bbcfb144649796edf5fc4c08fbfd4", + "darwin_x86_64": "dd0bd566a4e9eb41ff7e80607105ddd7e9e70c7fbda26771bf1d7608f332c9db", + "windows_arm64": "17c4e9db6e2d5bf82e63232ac893ff4d56bcbf22bc43fd99c69ab7a41dd2e188", + "linux_x86_64": "ed06fd82a8c408e12f2290d369cdd689e88bb3bac0a7e1e7808150eb1aedf54c" } } \ No newline at end of file diff --git a/gitlab/__tests__/main.test.ts b/gitlab/__tests__/main.test.ts index 853ca08d..ac06e3ba 100644 --- a/gitlab/__tests__/main.test.ts +++ b/gitlab/__tests__/main.test.ts @@ -91,7 +91,7 @@ so that the job will upload the files as the job artifacts: \`\`\`yaml include: - - component: $CI_SERVER_FQDN/qodana/qodana/qodana-gitlab-ci@2025.1.1 + - component: $CI_SERVER_FQDN/qodana/qodana/qodana-gitlab-ci@2025.2.1 inputs: upload-result: true \`\`\` diff --git a/gitlab/dist/qodana-gitlab.js b/gitlab/dist/qodana-gitlab.js index 5b2f57b5..54fdd4da 100644 --- a/gitlab/dist/qodana-gitlab.js +++ b/gitlab/dist/qodana-gitlab.js @@ -38,7 +38,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru var version, checksum; var init_cli = __esm({ "../common/cli.json"() { - version = "2025.1.1"; + version = "2025.2.1"; checksum = { windows_x86_64: "9b6b30b295b1cc0e60c2be04f4f0054d19a35b79e13c3544c054c1bd052da164", linux_arm64: "656527c02c9a12351949f96064a9599c591de2eec856d218f23ad0ea49445602", diff --git a/gradle.properties b/gradle.properties index 89b5f004..81c5cb19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ name=Qodana for Gradle projectGroup=org.jetbrains.qodana -majorVersion=2025.1 +majorVersion=2025.2 buildNumber=0-SNAPSHOT description=Qodana for Gradle plugin allows to run and configure Qodana analysis for Gradle projects. tags=qodana,intellij,idea,inspections diff --git a/orb/commands/scan.yml b/orb/commands/scan.yml index d9ad2f28..b9c8433d 100644 --- a/orb/commands/scan.yml +++ b/orb/commands/scan.yml @@ -34,13 +34,13 @@ parameters: Optional. primary-cache-key: type: string - default: qodana-2025.1-<< pipeline.git.branch >>-<< pipeline.git.revision >> + default: qodana-2025.2-<< pipeline.git.branch >>-<< pipeline.git.revision >> description: > Allows customizing the primary cache hash. Optional. additional-cache-key: type: string - default: qodana-2025.1-<< pipeline.git.branch >> + default: qodana-2025.2-<< pipeline.git.branch >> description: > Allows customizing the additional cache hash. Optional. @@ -53,12 +53,12 @@ steps: name: Qodana Scan command: | set -e - QODANA_SHA_256=6d15923f59f55f3bbed7cf751a16d3785eaa5e49c451a27bd1b5877d574e6f8c - CLI_DIRECTORY=/tmp/cache/qodana-cli/2025.1.1 + QODANA_SHA_256=b3ece16d6c2df90c3b27453542c43dec803b5f8df584227eff81320694985700 + CLI_DIRECTORY=/tmp/cache/qodana-cli/2025.2.1 mkdir -p $CLI_DIRECTORY if [[ ! -x "$CLI_DIRECTORY/qodana" ]]; then curl -fsSL https://jb.gg/qodana-cli/install | bash -s -- \ - v2025.1.1 $CLI_DIRECTORY \ + v2025.2.1 $CLI_DIRECTORY \ 1> /dev/null fi echo "$QODANA_SHA_256 $CLI_DIRECTORY/qodana" | sha256sum -c diff --git a/orb/examples/scan.yml b/orb/examples/scan.yml index 3354a0e6..cae55a65 100755 --- a/orb/examples/scan.yml +++ b/orb/examples/scan.yml @@ -3,7 +3,7 @@ description: > usage: version: 2.1 orbs: - qodana: jetbrains/qodana@2025.1.1 + qodana: jetbrains/qodana@2025.2.1 jobs: code-quality: machine: diff --git a/plugin/src/main/kotlin/org/jetbrains/qodana/Checksums.kt b/plugin/src/main/kotlin/org/jetbrains/qodana/Checksums.kt index 846bc69a..b6fa670f 100644 --- a/plugin/src/main/kotlin/org/jetbrains/qodana/Checksums.kt +++ b/plugin/src/main/kotlin/org/jetbrains/qodana/Checksums.kt @@ -146,5 +146,13 @@ val CHECKSUMS = mapOf( "linux_arm64" to "05a79622cd8af188815974bd3ffc28ef8a551d88a2068ea4cc2113fa61eb0c3a", "darwin_x86_64" to "2744d09c560144d0d6364fa50b6a774fa183dd201c9d7a44ae002656f39c5842", "darwin_arm64" to "cf942b582d79427f82204f1afe427dcfe634f33893c6cf308ce4e84872238bf6" + ), + "2025.2.1" to mapOf( + "windows_x86_64" to "d11c354aafb785ecfa0592929d602bdb4a14f0c2f4cdbfe60c09f93585a65e59", + "windows_arm64" to "f99c96d575dbfcec423b750a5897a6f7ffd6c621383a772e257952caa751757f", + "linux_x86_64" to "b3ece16d6c2df90c3b27453542c43dec803b5f8df584227eff81320694985700", + "linux_arm64" to "471becf628a30133a2a33896f75ddd96b59194e5731de97169c239da02f28f61", + "darwin_x86_64" to "012675e6e0194f23024414e42a10a5a4e3d1729a388e9858832c562bfb76c554", + "darwin_arm64" to "60cce4edc328f3f8caa3eb318a75e677c6abeb98e674331ed543c7b80a5b95a9" ) ) \ No newline at end of file diff --git a/plugin/src/main/kotlin/org/jetbrains/qodana/Qodana.kt b/plugin/src/main/kotlin/org/jetbrains/qodana/Qodana.kt index 756646b4..b0e317f5 100644 --- a/plugin/src/main/kotlin/org/jetbrains/qodana/Qodana.kt +++ b/plugin/src/main/kotlin/org/jetbrains/qodana/Qodana.kt @@ -32,7 +32,7 @@ class Installer { val log: Logger = Logger.getLogger(Installer::class.java.name) companion object { - private const val LATEST_VERSION = "v2025.1.1" + private const val LATEST_VERSION = "v2025.2.1" private const val RELEASE_DOWNLOAD_URL = "https://github.com/JetBrains/qodana-cli/releases/download/%s/qodana_%s_%s" diff --git a/scan/__tests__/main.test.ts b/scan/__tests__/main.test.ts index c9d2bed2..da00a8fa 100644 --- a/scan/__tests__/main.test.ts +++ b/scan/__tests__/main.test.ts @@ -75,7 +75,7 @@ test('validate branch names', () => { 'refs/heads/main', 'refs/tags/v1.0.0', 'refs/pull/123/merge', - 'v2025.1.1' + 'v2025.2.1' ] for (let branchName of validBranchNames) { expect(validateBranchName(branchName)).toEqual(branchName) @@ -278,7 +278,7 @@ To get \`*.log\` files or any other Qodana artifacts, run the action with \`uplo so that the action will upload the files as the job artifacts: \`\`\`yaml - name: 'Qodana Scan' - uses: JetBrains/qodana-action@v2025.1.1 + uses: JetBrains/qodana-action@v2025.2.1 with: upload-result: true \`\`\` diff --git a/scan/dist/index.js b/scan/dist/index.js index 08cc2a34..012f68c1 100644 --- a/scan/dist/index.js +++ b/scan/dist/index.js @@ -20467,14 +20467,14 @@ Support boolean input list: \`true | True | TRUE | false | False | FALSE\``); var version, checksum; var init_cli = __esm({ "../common/cli.json"() { - version = "2025.1.1"; + version = "2025.2.1"; checksum = { - windows_x86_64: "9b6b30b295b1cc0e60c2be04f4f0054d19a35b79e13c3544c054c1bd052da164", - linux_arm64: "656527c02c9a12351949f96064a9599c591de2eec856d218f23ad0ea49445602", - darwin_arm64: "c2e365bb218413fcef4279463823d42ebce8472d12ecff0ad4266d5ad26e0cdc", - darwin_x86_64: "81cd002d9fcc560596ac35172ccea6958f1645030fde8111c628b98391d16761", - windows_arm64: "fb474395342443afa57eb9fa019544a487119b4e418cec1b823bbf238bd9e85f", - linux_x86_64: "785dac6b5e1d78f96b20e9ba5600590c1779d5b6daa9d57c003430adb27377e2" + windows_x86_64: "134b8248ce23b7e471cdc32c1a917011f510bba9f5bf0ca5be32afcc86bc9547", + linux_arm64: "efabe2eb9ec8a1e9794f0fe3e0a0ebf1ce7a20105dedd6baf0161503e84a438d", + darwin_arm64: "43a92cc573a425a5ce305f61c675acc75f6bbcfb144649796edf5fc4c08fbfd4", + darwin_x86_64: "dd0bd566a4e9eb41ff7e80607105ddd7e9e70c7fbda26771bf1d7608f332c9db", + windows_arm64: "17c4e9db6e2d5bf82e63232ac893ff4d56bcbf22bc43fd99c69ab7a41dd2e188", + linux_x86_64: "ed06fd82a8c408e12f2290d369cdd689e88bb3bac0a7e1e7808150eb1aedf54c" }; } }); diff --git a/scan/package.json b/scan/package.json index 160714fe..951fd1a0 100644 --- a/scan/package.json +++ b/scan/package.json @@ -9,7 +9,7 @@ "build": "tsc --build .", "package": "../node_modules/.bin/esbuild lib/main.js --platform=node --keep-names --bundle --outfile=dist/index.js", "test": "jest --config jest.config.js", - "readme": "cp ../.github/md/github.md ../README.md && curl -sS https://raw.githubusercontent.com/JetBrains/Qodana/2025.1/topics/github.md >> ../README.md && cat ../.github/md/tracker.md >> ../README.md" + "readme": "cp ../.github/md/github.md ../README.md && curl -sS https://raw.githubusercontent.com/JetBrains/Qodana/2025.2/topics/github.md >> ../README.md && cat ../.github/md/tracker.md >> ../README.md" }, "repository": { "type": "git", diff --git a/vsts/QodanaScan/index.js b/vsts/QodanaScan/index.js index b1c97750..11f4f8ae 100644 --- a/vsts/QodanaScan/index.js +++ b/vsts/QodanaScan/index.js @@ -37,14 +37,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru var version, checksum; var init_cli = __esm({ "../common/cli.json"() { - version = "2025.1.1"; + version = "2025.2.1"; checksum = { - windows_x86_64: "9b6b30b295b1cc0e60c2be04f4f0054d19a35b79e13c3544c054c1bd052da164", - linux_arm64: "656527c02c9a12351949f96064a9599c591de2eec856d218f23ad0ea49445602", - darwin_arm64: "c2e365bb218413fcef4279463823d42ebce8472d12ecff0ad4266d5ad26e0cdc", - darwin_x86_64: "81cd002d9fcc560596ac35172ccea6958f1645030fde8111c628b98391d16761", - windows_arm64: "fb474395342443afa57eb9fa019544a487119b4e418cec1b823bbf238bd9e85f", - linux_x86_64: "785dac6b5e1d78f96b20e9ba5600590c1779d5b6daa9d57c003430adb27377e2" + windows_x86_64: "134b8248ce23b7e471cdc32c1a917011f510bba9f5bf0ca5be32afcc86bc9547", + linux_arm64: "efabe2eb9ec8a1e9794f0fe3e0a0ebf1ce7a20105dedd6baf0161503e84a438d", + darwin_arm64: "43a92cc573a425a5ce305f61c675acc75f6bbcfb144649796edf5fc4c08fbfd4", + darwin_x86_64: "dd0bd566a4e9eb41ff7e80607105ddd7e9e70c7fbda26771bf1d7608f332c9db", + windows_arm64: "17c4e9db6e2d5bf82e63232ac893ff4d56bcbf22bc43fd99c69ab7a41dd2e188", + linux_x86_64: "ed06fd82a8c408e12f2290d369cdd689e88bb3bac0a7e1e7808150eb1aedf54c" }; } }); diff --git a/vsts/QodanaScan/task.json b/vsts/QodanaScan/task.json index d8fbe3a8..dff3381f 100644 --- a/vsts/QodanaScan/task.json +++ b/vsts/QodanaScan/task.json @@ -9,7 +9,7 @@ "author": "JetBrains", "version": { "Major": 2025, - "Minor": 1, + "Minor": 2, "Patch": 1 }, "instanceNameFormat": "Qodana Scan", diff --git a/vsts/__tests__/main.test.ts b/vsts/__tests__/main.test.ts index 2dc1fea6..bd8c61b4 100644 --- a/vsts/__tests__/main.test.ts +++ b/vsts/__tests__/main.test.ts @@ -90,7 +90,7 @@ To be able to view the detailed Qodana report, you can either: To get \`*.log\` files or any other Qodana artifacts, run the task with \`uploadResult\` option set to \`true\`, so that the action will upload the files as the job artifacts: \`\`\`yaml - - task: QodanaScan@2025.1.1 + - task: QodanaScan@2025.2.1 inputs: uploadResult: true \`\`\` diff --git a/vsts/vss-extension.dev.json b/vsts/vss-extension.dev.json index 66a58e34..2ee70b95 100644 --- a/vsts/vss-extension.dev.json +++ b/vsts/vss-extension.dev.json @@ -2,7 +2,7 @@ "manifestVersion": 1, "id": "qodana-dev", "name": "Qodana (Dev)", - "version": "2025.1.208", + "version": "2025.2.209", "publisher": "JetBrains", "targets": [ { diff --git a/vsts/vss-extension.json b/vsts/vss-extension.json index f76ebcae..69be6b77 100644 --- a/vsts/vss-extension.json +++ b/vsts/vss-extension.json @@ -2,7 +2,7 @@ "manifestVersion": 1, "id": "qodana", "name": "Qodana", - "version": "2025.1.1", + "version": "2025.2.1", "public": true, "publisher": "JetBrains", "targets": [