⬆️ Update qodana to v2024.1.7

JetBrains · Jul 2, 2024 · e995eec · e995eec
1 parent abc870b
commit e995eec
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 65 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -14,6 +14,9 @@ on:
  - 'gradle/**'
  - 'src/**'
  - '*gradle*'
+ - 'plugin/**'
+ - 'common/src/**'
+ - 'common/build.gradle.kts'
 jobs:
  gradleValidation:
  name: gradle-wrapper

diff --git a/GRADLE.md b/GRADLE.md
@@ -23,15 +23,15 @@ Apply Gradle plugin `org.jetbrains.qodana` in the Gradle configuration file:
 
  ```groovy
  plugins {
- id "org.jetbrains.qodana" version "2024.1.6"
+ id "org.jetbrains.qodana" version "2024.1.7"
  }
  ```
 
 - Kotlin DSL – `build.gradle.kts`
 
  ```kotlin
  plugins {
- id("org.jetbrains.qodana") version "2024.1.6"
+ id("org.jetbrains.qodana") version "2024.1.7"
  }
  ```
 
@@ -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.6"
+ id "org.jetbrains.qodana" version "2024.1.7"
  }
  
  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.6"
+ id("org.jetbrains.qodana") version "2024.1.7"
  }
  
  qodana {

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -30,7 +30,7 @@ version = "${properties("majorVersion").get()}.${properties("buildNumber").get()
 
 kotlin {
  jvmToolchain(8)
- version = "2024.1.6"
+ version = "2024.1.7"
 }
 
 tasks.register<Jar>("jarSources") {

diff --git a/common/cli.json b/common/cli.json
@@ -1,11 +1,11 @@
 {
- "version": "2024.1.6",
+ "version": "2024.1.7",
  "checksum": {
- "windows_x86_64": "1701c23a4ef7dcfbeb3563a4a3f0d1681bbf25dad34938783d755833fff90276",
- "linux_arm64": "8e4f61b30dcebba06923828aef62329acf8f0caa49f2159689dce277c55466bd",
- "darwin_arm64": "40aa43ab15f3979a7a506dee18eaa7f57cc1c634a8347fd2cf3096750b082b2e",
- "darwin_x86_64": "c2e9bacfb842a3a0890ce81d64d93040dfba996f5cd9df73335ef5448e5c86a6",
- "windows_arm64": "0cfb3b9912aafda00ce2d91e8d778f8e5d71e130a7b5c3fbaf71926d0bff7c70",
- "linux_x86_64": "6252d97a6e9f674863f3dcc43bb84c48c71db88400c28036738959443591fea4"
+ "windows_x86_64": "c7523a1332f566519111dad70b7f39e25aabe2b4db7790c8eeb0503e8e0bc5a8",
+ "linux_arm64": "ba196787569f97519d002446844ee72402e3700d86c475c3145088ec9d4dcfc2",
+ "darwin_arm64": "abaf85c4295760e4c8cc75518c16ea7d68818a2a8438cf8005640b13a87f58af",
+ "darwin_x86_64": "20b296f31f00e9aac0ab186a85cf13d03d49b737bda5ec37f8ed82316ffa2d45",
+ "windows_arm64": "26709690340e873b37288beabec93a570fa0530a59fb43cdac3eb7e9df5dc1dc",
+ "linux_x86_64": "49173d02499c9bf485c02a76315d208d8382cd02cbf0b135dc741a2c74922095"
  }
 }
diff --git a/common/src/main/kotlin/org/jetbrains/qodana/cli/Checksums.kt b/common/src/main/kotlin/org/jetbrains/qodana/cli/Checksums.kt
@@ -34,5 +34,13 @@ val CHECKSUMS = mapOf(
  "linux_arm64" to "b127fc5fe46f5c197781ff0f30de4e4f68b3ba19c5748dcb87c3d1417a3d9f89",
  "darwin_x86_64" to "847495bdeb8bffd2e13b0af8decdbd3b7b23735ad18746d0629e7a5e25c867de",
  "darwin_arm64" to "e87ff91a64b8c77466938ee2020bf8636b46016ff9b587aa3fcaa356d6de6b72"
- )
+ ),
+ "2024.1.7" to mapOf(
+ "windows_x86_64" to "f0eedf835527f192d8e22b67ecfcd34c719059795e5f4556a4fb794f8df7db3e",
+ "windows_arm64" to "e9b51ceaf547b407a89ce2e1de1772d1457aca1574ba5680166eb65d20c7713b",
+ "linux_x86_64" to "b98b54405c54203976b3b28e18a57b4f33bdb6f2bb7c5768ef3560cb4dc5cfcb",
+ "linux_arm64" to "cfd842980e4c237cf54fcdff9e68f3a568e77f275e4e2a25e79d95c2a2ef62f5",
+ "darwin_x86_64" to "21ce44b0ab96573ef75406e741e132e2f8c92c2e24d1d0370871276135c525ca",
+ "darwin_arm64" to "fee1093b5d8202405615f2630ae44621c3168e59b7f5703a9e453f8666a0cae2"
+ ),
 )
diff --git a/common/src/main/kotlin/org/jetbrains/qodana/cli/Qodana.kt b/common/src/main/kotlin/org/jetbrains/qodana/cli/Qodana.kt
@@ -32,7 +32,7 @@ class Installer {
  val log: Logger = Logger.getLogger(Installer::class.java.name)
 
  companion object {
- private const val LATEST_VERSION = "2024.1.6"
+ private const val LATEST_VERSION = "2024.1.7"
  private const val RELEASE_DOWNLOAD_URL =
  "https://github.com/JetBrains/qodana-cli/releases/download/v%s/qodana_%s_%s"
 

diff --git a/common/update-cli.js b/common/update-cli.js
@@ -127,8 +127,8 @@ function updateChecksumsKtFile(checksums, latestVersion) {
  const match = checksumSectionRegex.exec(checksumsKtContent);
 
  if (match) {
- const newContent = match[0].replace(")", `,\n${newChecksums})`);
- checksumsKtContent = checksumsKtContent.replace(checksumSectionRegex, newContent);
+ const updatedContent = match[0].replace(")", `,\n${newChecksums}\n)`);
+ checksumsKtContent = checksumsKtContent.replace(checksumSectionRegex, updatedContent);
  } else {
  const newContent = `val CHECKSUMS = mapOf(\n${newChecksums}\n)`;
  checksumsKtContent = checksumsKtContent.replace("val CHECKSUMS = mapOf()", newContent);

diff --git a/orb/commands/scan.yml b/orb/commands/scan.yml
@@ -53,12 +53,12 @@ steps:
  name: Qodana Scan
  command: |
  set -e
- QODANA_SHA_256=597d870f4c747d04d0280956306e2e7b9e003662d4600d93c1b69fcaffc2bb7b
- CLI_DIRECTORY=/tmp/cache/qodana-cli/2024.1.6
+ QODANA_SHA_256=b98b54405c54203976b3b28e18a57b4f33bdb6f2bb7c5768ef3560cb4dc5cfcb
+ CLI_DIRECTORY=/tmp/cache/qodana-cli/2024.1.7
  mkdir -p $CLI_DIRECTORY
  if [[ ! -x "$CLI_DIRECTORY/qodana" ]]; then
  curl -fsSL https://jb.gg/qodana-cli/install | bash -s -- \
- v2024.1.6 $CLI_DIRECTORY \
+ v2024.1.7 $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
@@ -3,7 +3,7 @@ description: >
 usage:
  version: 2.1
  orbs:
- qodana: jetbrains/qodana@2024.1.6
+ qodana: jetbrains/qodana@2024.1.7
  jobs:
  code-quality:
  machine:

diff --git 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.6'
+ 'v2024.1.7'
  ]
  for (let branchName of validBranchNames) {
  expect(validateBranchName(branchName)).toEqual(branchName)
@@ -331,7 +331,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.6
+ uses: JetBrains/qodana-action@v2024.1.7
  with:
  upload-result: true
 \`\`\`

diff --git a/scan/dist/index.js b/scan/dist/index.js
@@ -24193,14 +24193,14 @@ var require_io = __commonJS({
 var version2, checksum;
 var init_cli = __esm({
  "../common/cli.json"() {
- version2 = "2024.1.6";
+ version2 = "2024.1.7";
  checksum = {
- windows_x86_64: "1701c23a4ef7dcfbeb3563a4a3f0d1681bbf25dad34938783d755833fff90276",
- linux_arm64: "8e4f61b30dcebba06923828aef62329acf8f0caa49f2159689dce277c55466bd",
- darwin_arm64: "40aa43ab15f3979a7a506dee18eaa7f57cc1c634a8347fd2cf3096750b082b2e",
- darwin_x86_64: "c2e9bacfb842a3a0890ce81d64d93040dfba996f5cd9df73335ef5448e5c86a6",
- windows_arm64: "0cfb3b9912aafda00ce2d91e8d778f8e5d71e130a7b5c3fbaf71926d0bff7c70",
- linux_x86_64: "6252d97a6e9f674863f3dcc43bb84c48c71db88400c28036738959443591fea4"
+ windows_x86_64: "c7523a1332f566519111dad70b7f39e25aabe2b4db7790c8eeb0503e8e0bc5a8",
+ linux_arm64: "ba196787569f97519d002446844ee72402e3700d86c475c3145088ec9d4dcfc2",
+ darwin_arm64: "abaf85c4295760e4c8cc75518c16ea7d68818a2a8438cf8005640b13a87f58af",
+ darwin_x86_64: "20b296f31f00e9aac0ab186a85cf13d03d49b737bda5ec37f8ed82316ffa2d45",
+ windows_arm64: "26709690340e873b37288beabec93a570fa0530a59fb43cdac3eb7e9df5dc1dc",
+ linux_x86_64: "49173d02499c9bf485c02a76315d208d8382cd02cbf0b135dc741a2c74922095"
  };
  }
 });

diff --git 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.6";
+ version = "2024.1.7";
  checksum = {
- windows_x86_64: "1701c23a4ef7dcfbeb3563a4a3f0d1681bbf25dad34938783d755833fff90276",
- linux_arm64: "8e4f61b30dcebba06923828aef62329acf8f0caa49f2159689dce277c55466bd",
- darwin_arm64: "40aa43ab15f3979a7a506dee18eaa7f57cc1c634a8347fd2cf3096750b082b2e",
- darwin_x86_64: "c2e9bacfb842a3a0890ce81d64d93040dfba996f5cd9df73335ef5448e5c86a6",
- windows_arm64: "0cfb3b9912aafda00ce2d91e8d778f8e5d71e130a7b5c3fbaf71926d0bff7c70",
- linux_x86_64: "6252d97a6e9f674863f3dcc43bb84c48c71db88400c28036738959443591fea4"
+ windows_x86_64: "c7523a1332f566519111dad70b7f39e25aabe2b4db7790c8eeb0503e8e0bc5a8",
+ linux_arm64: "ba196787569f97519d002446844ee72402e3700d86c475c3145088ec9d4dcfc2",
+ darwin_arm64: "abaf85c4295760e4c8cc75518c16ea7d68818a2a8438cf8005640b13a87f58af",
+ darwin_x86_64: "20b296f31f00e9aac0ab186a85cf13d03d49b737bda5ec37f8ed82316ffa2d45",
+ windows_arm64: "26709690340e873b37288beabec93a570fa0530a59fb43cdac3eb7e9df5dc1dc",
+ linux_x86_64: "49173d02499c9bf485c02a76315d208d8382cd02cbf0b135dc741a2c74922095"
  };
  }
 });
@@ -4411,14 +4411,10 @@ var require_semver_compare = __commonJS({
  for (var i = 0; i < 3; i++) {
  var na = Number(pa[i]);
  var nb = Number(pb[i]);
- if (na > nb)
- return 1;
- if (nb > na)
- return -1;
- if (!isNaN(na) && isNaN(nb))
- return 1;
- if (isNaN(na) && !isNaN(nb))
- return -1;
+ if (na > nb) return 1;
+ if (nb > na) return -1;
+ if (!isNaN(na) && isNaN(nb)) return 1;
+ if (isNaN(na) && !isNaN(nb)) return -1;
  }
  return 0;
  };
@@ -4939,8 +4935,7 @@ var require_utils2 = __commonJS({
  "lib/utils.js"(exports2) {
  "use strict";
  var __createBinding2 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
- if (k2 === void 0)
- k2 = k;
+ if (k2 === void 0) k2 = k;
  var desc = Object.getOwnPropertyDescriptor(m, k);
  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
  desc = { enumerable: true, get: function() {
@@ -4949,8 +4944,7 @@ var require_utils2 = __commonJS({
  }
  Object.defineProperty(o, k2, desc);
  } : function(o, m, k, k2) {
- if (k2 === void 0)
- k2 = k;
+ if (k2 === void 0) k2 = k;
  o[k2] = m[k];
  });
  var __setModuleDefault2 = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
@@ -4959,13 +4953,10 @@ var require_utils2 = __commonJS({
  o["default"] = v;
  });
  var __importStar2 = exports2 && exports2.__importStar || function(mod) {
- if (mod && mod.__esModule)
- return mod;
+ if (mod && mod.__esModule) return mod;
  var result = {};
  if (mod != null) {
- for (var k in mod)
- if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
- __createBinding2(result, mod, k);
+ for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding2(result, mod, k);
  }
  __setModuleDefault2(result, mod);
  return result;
@@ -5110,8 +5101,7 @@ var require_utils2 = __commonJS({
 
 // lib/main.js
 var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
- if (k2 === void 0)
- k2 = k;
+ if (k2 === void 0) k2 = k;
  var desc = Object.getOwnPropertyDescriptor(m, k);
  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
  desc = { enumerable: true, get: function() {
@@ -5120,8 +5110,7 @@ var __createBinding = exports && exports.__createBinding || (Object.create ? fun
  }
  Object.defineProperty(o, k2, desc);
 } : function(o, m, k, k2) {
- if (k2 === void 0)
- k2 = k;
+ if (k2 === void 0) k2 = k;
  o[k2] = m[k];
 });
 var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? function(o, v) {
@@ -5130,13 +5119,10 @@ var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create
  o["default"] = v;
 });
 var __importStar = exports && exports.__importStar || function(mod) {
- if (mod && mod.__esModule)
- return mod;
+ if (mod && mod.__esModule) return mod;
  var result = {};
  if (mod != null) {
- for (var k in mod)
- if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
- __createBinding(result, mod, k);
+ for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
  }
  __setModuleDefault(result, mod);
  return result;

diff --git a/vsts/QodanaScan/task.json b/vsts/QodanaScan/task.json
@@ -10,7 +10,7 @@
  "version": {
  "Major": 2024,
  "Minor": 1,
- "Patch": 6
+ "Patch": 7
  },
  "instanceNameFormat": "Qodana Scan",
  "inputs": [

diff --git 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.6",
+ "version": "2024.1.7",
  "publisher": "JetBrains",
  "targets": [
  {

diff --git a/vsts/vss-extension.json b/vsts/vss-extension.json
@@ -2,7 +2,7 @@
  "manifestVersion": 1,
  "id": "qodana",
  "name": "Qodana",
- "version": "2024.1.6",
+ "version": "2024.1.7",
  "public": true,
  "publisher": "JetBrains",
  "targets": [