diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b12adbc9..75d56f6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -132,7 +132,7 @@ Apply Gradle Qodana Plugin with snapshot version in Gradle configuration file an ```groovy plugins { - id "org.jetbrains.qodana" version "2023.3.0-SNAPSHOT" + id "org.jetbrains.qodana" version "2024.1.0-SNAPSHOT" } qodana { @@ -143,7 +143,7 @@ Apply Gradle Qodana Plugin with snapshot version in Gradle configuration file an ```kotlin plugins { - id("org.jetbrains.qodana") version "2023.3.0-SNAPSHOT" + id("org.jetbrains.qodana") version "2024.1.0-SNAPSHOT" } qodana { diff --git a/GRADLE.md b/GRADLE.md index 29236adc..d9388569 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 "2023.3.2" + id "org.jetbrains.qodana" version "2024.1.1" } ``` @@ -31,7 +31,7 @@ Apply Gradle plugin `org.jetbrains.qodana` in the Gradle configuration file: ```kotlin plugins { - id("org.jetbrains.qodana") version "2023.3.2" + id("org.jetbrains.qodana") version "2024.1.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 "2023.3.2" + id "org.jetbrains.qodana" version "2024.1.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 "2023.3.2" + id("org.jetbrains.qodana") version "2024.1.1" } qodana { diff --git a/README.md b/README.md index 73d436da..c8c3c6f6 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@v2023.3 + uses: JetBrains/qodana-action@v2024.1 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@v2023.3 + uses: JetBrains/qodana-action@v2024.1 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@v2023.3 + uses: JetBrains/qodana-action@v2024.1 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-2023.3-${{ 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-2023.3-${{ 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.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 }}` | | `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 b687a509..7744697e 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-2023.3-${{ github.ref }}-${{ github.sha }}" + default: "qodana-2024.1-${{ github.ref }}-${{ github.sha }}" additional-cache-key: description: 'Set the additional cache key' required: false - default: "qodana-2023.3-${{ github.ref }}" + default: "qodana-2024.1-${{ github.ref }}" cache-default-branch-only: description: 'Upload cache for the default branch only' required: false diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3bc00ece..6f2be02f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,6 +9,6 @@ pool: vmImage: ubuntu-latest steps: - - task: QodanaScan@2023 + - task: QodanaScan@2024 inputs: args: --log-level,debug,-l,jetbrains/qodana-jvm-community:latest,--property,idea.headless.enable.statistics=false diff --git a/common/cli.json b/common/cli.json index e2d799e7..03b7e5e4 100644 --- a/common/cli.json +++ b/common/cli.json @@ -1,11 +1,11 @@ { - "version": "2023.3.2", + "version": "2024.1.1", "checksum": { - "windows_x86_64": "50768fa57f0e6603d44dc2e505b59afd3ee3064740443443ab5c747a973d75d6", - "linux_arm64": "61c87ad3f8f72de5cdb5ac78821f0cef9cffec12e36d62b1747d246b01031bf5", - "darwin_arm64": "23383d46ea5f2c92719f4d31581e1672dde6f9dc52df00c87be603ed1181b6ab", - "darwin_x86_64": "6e38b4ea3d59c5e517ce2b5c530fb373acccacff311fbfca283c293e2dfee51c", - "windows_arm64": "eec404334deea68e6f0efffc12e6bd0ff516c1aa9bdd327bb4ef1e0b4d415bab", - "linux_x86_64": "08641aed84e7cb9d422feabbaa60034322f3471d3ae7f5c7b04da0b766981886" + "windows_x86_64": "6dc20c32fbccf9c269a95620c5f3bcf87da6f0be7436e1c3e6bfb4eed064db61", + "linux_arm64": "7e5a5a0889146e218479e036230275c3a372ca63596ef3ddb02c46e8303b9ff8", + "darwin_arm64": "c82db40dcc8464e8e34ce625f4460b9fea57a58c5d37f7fd827a1cf829d6470e", + "darwin_x86_64": "b17cf85aaaa4f548178bf33f6ff50e4175f59ff1474e43ed20927a7cb666ff54", + "windows_arm64": "dffc99c83b44a76e0ebbb3c0be4756f48f4fd954e6a99de5e4a31f6c612a4427", + "linux_x86_64": "3670e2e46a5677370fa0feddc6096bb02a00fc2fccb84e707b7382c5a126a433" } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 7da3f2b4..86e68217 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ name=Qodana for Gradle projectGroup=org.jetbrains.qodana -majorVersion=2023.3 +majorVersion=2024.1 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 102b4d21..df58229c 100644 --- a/orb/commands/scan.yml +++ b/orb/commands/scan.yml @@ -34,13 +34,13 @@ parameters: Optional. primary-cache-key: type: string - default: qodana-2023.1-<< pipeline.git.branch >>-<< pipeline.git.revision >> + default: qodana-2024.1-<< pipeline.git.branch >>-<< pipeline.git.revision >> description: > Allows customizing the primary cache hash. Optional. additional-cache-key: type: string - default: qodana-2023.1-<< pipeline.git.branch >> + default: qodana-2024.1-<< 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=71abcb82489daba6200b5791ee56058a2f8ad8a87f8bbdcd33e6180906e1e482 - CLI_DIRECTORY=/tmp/cache/qodana-cli/2023.3.2 + QODANA_SHA_256=e52213d3ec7f4657b1f9320a7d893d94139be214014c447fc2bdb1b342ff808d + CLI_DIRECTORY=/tmp/cache/qodana-cli/2024.1.1 mkdir -p $CLI_DIRECTORY if [[ ! -x "$CLI_DIRECTORY/qodana" ]]; then curl -fsSL https://jb.gg/qodana-cli/install | bash -s -- \ - v2023.3.2 $CLI_DIRECTORY \ + v2024.1.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 e04a57d1..d2bf85fd 100755 --- a/orb/examples/scan.yml +++ b/orb/examples/scan.yml @@ -3,7 +3,7 @@ description: > usage: version: 2.1 orbs: - qodana: jetbrains/qodana@2023.3.2 + qodana: jetbrains/qodana@2024.1.1 jobs: code-quality: machine: diff --git a/scan/__tests__/main.test.ts b/scan/__tests__/main.test.ts index 3fa0d3b3..582c6293 100644 --- a/scan/__tests__/main.test.ts +++ b/scan/__tests__/main.test.ts @@ -297,7 +297,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@v2023.3.2 + uses: JetBrains/qodana-action@v2024.1.1 with: upload-result: true \`\`\` diff --git a/scan/dist/index.js b/scan/dist/index.js index 542b3a44..d55ea28c 100644 --- a/scan/dist/index.js +++ b/scan/dist/index.js @@ -24276,14 +24276,14 @@ var require_io = __commonJS({ var version2, checksum; var init_cli = __esm({ "../common/cli.json"() { - version2 = "2023.3.2"; + version2 = "2024.1.1"; checksum = { - windows_x86_64: "50768fa57f0e6603d44dc2e505b59afd3ee3064740443443ab5c747a973d75d6", - linux_arm64: "61c87ad3f8f72de5cdb5ac78821f0cef9cffec12e36d62b1747d246b01031bf5", - darwin_arm64: "23383d46ea5f2c92719f4d31581e1672dde6f9dc52df00c87be603ed1181b6ab", - darwin_x86_64: "6e38b4ea3d59c5e517ce2b5c530fb373acccacff311fbfca283c293e2dfee51c", - windows_arm64: "eec404334deea68e6f0efffc12e6bd0ff516c1aa9bdd327bb4ef1e0b4d415bab", - linux_x86_64: "08641aed84e7cb9d422feabbaa60034322f3471d3ae7f5c7b04da0b766981886" + windows_x86_64: "6dc20c32fbccf9c269a95620c5f3bcf87da6f0be7436e1c3e6bfb4eed064db61", + linux_arm64: "7e5a5a0889146e218479e036230275c3a372ca63596ef3ddb02c46e8303b9ff8", + darwin_arm64: "c82db40dcc8464e8e34ce625f4460b9fea57a58c5d37f7fd827a1cf829d6470e", + darwin_x86_64: "b17cf85aaaa4f548178bf33f6ff50e4175f59ff1474e43ed20927a7cb666ff54", + windows_arm64: "dffc99c83b44a76e0ebbb3c0be4756f48f4fd954e6a99de5e4a31f6c612a4427", + linux_x86_64: "3670e2e46a5677370fa0feddc6096bb02a00fc2fccb84e707b7382c5a126a433" }; } }); diff --git a/scan/package.json b/scan/package.json index b45b2d33..46ca119d 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/2023.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/2024.1/topics/github.md >> ../README.md && cat ../.github/md/tracker.md >> ../README.md" }, "repository": { "type": "git", diff --git a/src/main/kotlin/org/jetbrains/qodana/Qodana.kt b/src/main/kotlin/org/jetbrains/qodana/Qodana.kt index dbb7fc40..91b8fcae 100644 --- a/src/main/kotlin/org/jetbrains/qodana/Qodana.kt +++ b/src/main/kotlin/org/jetbrains/qodana/Qodana.kt @@ -14,7 +14,7 @@ import java.nio.file.attribute.PosixFilePermission class Installer { val log: Logger = org.gradle.api.logging.Logging.getLogger(Installer::class.java) companion object { - private const val VERSION = "2023.3.2" + private const val VERSION = "2024.1.1" private const val RELEASE_DOWNLOAD_URL = "https://github.com/JetBrains/qodana-cli/releases/download/v%s/qodana_%s_%s" fun getQodanaUrl(platform: String = getPlatformName(), arch: String = getArchName(), version: String = VERSION): String { diff --git a/vsts/QodanaScan/index.js b/vsts/QodanaScan/index.js index da1baad2..e4db28ad 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 = "2023.3.2"; + version = "2024.1.1"; checksum = { - windows_x86_64: "50768fa57f0e6603d44dc2e505b59afd3ee3064740443443ab5c747a973d75d6", - linux_arm64: "61c87ad3f8f72de5cdb5ac78821f0cef9cffec12e36d62b1747d246b01031bf5", - darwin_arm64: "23383d46ea5f2c92719f4d31581e1672dde6f9dc52df00c87be603ed1181b6ab", - darwin_x86_64: "6e38b4ea3d59c5e517ce2b5c530fb373acccacff311fbfca283c293e2dfee51c", - windows_arm64: "eec404334deea68e6f0efffc12e6bd0ff516c1aa9bdd327bb4ef1e0b4d415bab", - linux_x86_64: "08641aed84e7cb9d422feabbaa60034322f3471d3ae7f5c7b04da0b766981886" + windows_x86_64: "6dc20c32fbccf9c269a95620c5f3bcf87da6f0be7436e1c3e6bfb4eed064db61", + linux_arm64: "7e5a5a0889146e218479e036230275c3a372ca63596ef3ddb02c46e8303b9ff8", + darwin_arm64: "c82db40dcc8464e8e34ce625f4460b9fea57a58c5d37f7fd827a1cf829d6470e", + darwin_x86_64: "b17cf85aaaa4f548178bf33f6ff50e4175f59ff1474e43ed20927a7cb666ff54", + windows_arm64: "dffc99c83b44a76e0ebbb3c0be4756f48f4fd954e6a99de5e4a31f6c612a4427", + linux_x86_64: "3670e2e46a5677370fa0feddc6096bb02a00fc2fccb84e707b7382c5a126a433" }; } }); diff --git a/vsts/QodanaScan/task.json b/vsts/QodanaScan/task.json index b21f822e..832cd9b4 100644 --- a/vsts/QodanaScan/task.json +++ b/vsts/QodanaScan/task.json @@ -8,9 +8,9 @@ "category": "Utility", "author": "JetBrains", "version": { - "Major": 2023, - "Minor": 3, - "Patch": 2 + "Major": 2024, + "Minor": 1, + "Patch": 1 }, "instanceNameFormat": "Qodana Scan", "inputs": [ diff --git a/vsts/README.md b/vsts/README.md index 82f0e52c..9bcc4ea0 100644 --- a/vsts/README.md +++ b/vsts/README.md @@ -47,7 +47,7 @@ steps: restoreKeys: | "$(Build.Repository.Name)" | "$(Build.SourceBranchName)" "$(Build.Repository.Name)" - - task: QodanaScan@2023 + - task: QodanaScan@2024 ``` Triggering this job depends on [what type of repository you are using in Azure Pipelines](https://docs.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=azure-devops#classic-build-pipelines-and-yaml-pipelines). @@ -65,7 +65,7 @@ To send the results to Qodana Cloud, all you need to do is to specify the `QODAN add `QODANA_TOKEN` variable to the `env` section of the `QodanaScan` task: ```yaml - - task: QodanaScan@2023 + - task: QodanaScan@2024 env: QODANA_TOKEN: $(QODANA_TOKEN) ``` diff --git a/vsts/vss-extension.dev.json b/vsts/vss-extension.dev.json index 28931e71..67f67993 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": "2023.3.2", + "version": "2024.1.1", "publisher": "JetBrains", "targets": [ { diff --git a/vsts/vss-extension.json b/vsts/vss-extension.json index 210a248d..df5de115 100644 --- a/vsts/vss-extension.json +++ b/vsts/vss-extension.json @@ -2,7 +2,7 @@ "manifestVersion": 1, "id": "qodana", "name": "Qodana", - "version": "2023.3.2", + "version": "2024.1.1", "public": true, "publisher": "JetBrains", "targets": [