Skip to content

Commit

Permalink
Merge pull request #310 from JetBrains/next
Browse files Browse the repository at this point in the history
⬆️ Update `qodana` to the `v2024.1.5`
  • Loading branch information
avafanasiev committed May 16, 2024
2 parents 85272e3 + eeccdb2 commit 32840fd
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 61 deletions.
8 changes: 4 additions & 4 deletions GRADLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ Apply Gradle plugin `org.jetbrains.qodana` in the Gradle configuration file:

```groovy
plugins {
id "org.jetbrains.qodana" version "2024.1.4"
id "org.jetbrains.qodana" version "2024.1.5"
}
```

- Kotlin DSL – `build.gradle.kts`

```kotlin
plugins {
id("org.jetbrains.qodana") version "2024.1.4"
id("org.jetbrains.qodana") version "2024.1.5"
}
```

Expand Down Expand Up @@ -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.4"
id "org.jetbrains.qodana" version "2024.1.5"
}
qodana {
Expand All @@ -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.4"
id("org.jetbrains.qodana") version "2024.1.5"
}

qodana {
Expand Down
14 changes: 7 additions & 7 deletions common/cli.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"version": "2024.1.4",
"version": "2024.1.5",
"checksum": {
"windows_x86_64": "3b3b1edaca3f71b5fe77ab648d018888376d2802dc287c94ecee90b7bcaff987",
"linux_arm64": "fd762155cfae896304270e369b377ce4801dfe13c42958ab474cd54c8312cfd6",
"darwin_arm64": "7d2f42b6ac62ea592070446b389695a0573fa0eba83190938f5a337a38382690",
"darwin_x86_64": "ea776eba1e67ba9ea0ebd959ba2d00ef0f2f14792b13397dad5e387a40b1b902",
"windows_arm64": "1bd3dc9a4e9fdcb5cce6750ba93f39377b1e0aac77df1b76d843df930550076b",
"linux_x86_64": "49b2af634e5142b9f697f3b5fc571c0f10e4ee619d1386d75108fe55eb49c44e"
"windows_x86_64": "cdb4bfb6e5fc5b37e14cc50fe9122847d008607fd0f27204340878bc15129e8a",
"linux_arm64": "c8468d63f68db9ee21cb78ca53a583743748dc236472e7e903a2bed50ed5b1e6",
"darwin_arm64": "3e6ac933d08d5e640ca89252808d661054f6b7c0d5749cb46f618165154fd809",
"darwin_x86_64": "9ed82db050f950bbeb992310aabd6dfac0cd6e5b65724d6ff2afa30e28b890bf",
"windows_arm64": "f435008eb63582744f21d0087c8f84442d911606d45fccb7bfd6ee9a8045ca28",
"linux_x86_64": "6a2c10b77a275ebd379acc27281de6cbf90402aab7ca6e1cc76ad083b7f55e99"
}
}
6 changes: 3 additions & 3 deletions orb/commands/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ steps:
name: Qodana Scan
command: |
set -e
QODANA_SHA_256=a82c6e1e5d892e7c70a976e35aec48b2ffef89b046bfdc527d68072bd980bd06
CLI_DIRECTORY=/tmp/cache/qodana-cli/2024.1.4
QODANA_SHA_256=a0d220cc09e95720143cdac1e51ddb7b4870b23507137f5138d78010ed4f633a
CLI_DIRECTORY=/tmp/cache/qodana-cli/2024.1.5
mkdir -p $CLI_DIRECTORY
if [[ ! -x "$CLI_DIRECTORY/qodana" ]]; then
curl -fsSL https://jb.gg/qodana-cli/install | bash -s -- \
v2024.1.4 $CLI_DIRECTORY \
v2024.1.5 $CLI_DIRECTORY \
1> /dev/null
fi
echo "$QODANA_SHA_256 $CLI_DIRECTORY/qodana" | sha256sum -c
Expand Down
2 changes: 1 addition & 1 deletion orb/examples/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: >
usage:
version: 2.1
orbs:
qodana: jetbrains/qodana@2024.1.4
qodana: jetbrains/qodana@2024.1.5
jobs:
code-quality:
machine:
Expand Down
4 changes: 2 additions & 2 deletions scan/__tests__/main.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ test('validate branch names', () => {
'refs/heads/main',
'refs/tags/v1.0.0',
'refs/pull/123/merge',
'v2024.1.4'
'v2024.1.5'
]
for (let branchName of validBranchNames) {
expect(validateBranchName(branchName)).toEqual(branchName)
Expand Down Expand Up @@ -315,7 +315,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.4
uses: JetBrains/qodana-action@v2024.1.5
with:
upload-result: true
\`\`\`
Expand Down
14 changes: 7 additions & 7 deletions scan/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24193,14 +24193,14 @@ var require_io = __commonJS({
var version2, checksum;
var init_cli = __esm({
"../common/cli.json"() {
version2 = "2024.1.4";
version2 = "2024.1.5";
checksum = {
windows_x86_64: "3b3b1edaca3f71b5fe77ab648d018888376d2802dc287c94ecee90b7bcaff987",
linux_arm64: "fd762155cfae896304270e369b377ce4801dfe13c42958ab474cd54c8312cfd6",
darwin_arm64: "7d2f42b6ac62ea592070446b389695a0573fa0eba83190938f5a337a38382690",
darwin_x86_64: "ea776eba1e67ba9ea0ebd959ba2d00ef0f2f14792b13397dad5e387a40b1b902",
windows_arm64: "1bd3dc9a4e9fdcb5cce6750ba93f39377b1e0aac77df1b76d843df930550076b",
linux_x86_64: "49b2af634e5142b9f697f3b5fc571c0f10e4ee619d1386d75108fe55eb49c44e"
windows_x86_64: "cdb4bfb6e5fc5b37e14cc50fe9122847d008607fd0f27204340878bc15129e8a",
linux_arm64: "c8468d63f68db9ee21cb78ca53a583743748dc236472e7e903a2bed50ed5b1e6",
darwin_arm64: "3e6ac933d08d5e640ca89252808d661054f6b7c0d5749cb46f618165154fd809",
darwin_x86_64: "9ed82db050f950bbeb992310aabd6dfac0cd6e5b65724d6ff2afa30e28b890bf",
windows_arm64: "f435008eb63582744f21d0087c8f84442d911606d45fccb7bfd6ee9a8045ca28",
linux_x86_64: "6a2c10b77a275ebd379acc27281de6cbf90402aab7ca6e1cc76ad083b7f55e99"
};
}
});
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/jetbrains/qodana/Qodana.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "2024.1.4"
private const val VERSION = "2024.1.5"
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 {
Expand Down
52 changes: 19 additions & 33 deletions vsts/QodanaScan/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.4";
version = "2024.1.5";
checksum = {
windows_x86_64: "3b3b1edaca3f71b5fe77ab648d018888376d2802dc287c94ecee90b7bcaff987",
linux_arm64: "fd762155cfae896304270e369b377ce4801dfe13c42958ab474cd54c8312cfd6",
darwin_arm64: "7d2f42b6ac62ea592070446b389695a0573fa0eba83190938f5a337a38382690",
darwin_x86_64: "ea776eba1e67ba9ea0ebd959ba2d00ef0f2f14792b13397dad5e387a40b1b902",
windows_arm64: "1bd3dc9a4e9fdcb5cce6750ba93f39377b1e0aac77df1b76d843df930550076b",
linux_x86_64: "49b2af634e5142b9f697f3b5fc571c0f10e4ee619d1386d75108fe55eb49c44e"
windows_x86_64: "cdb4bfb6e5fc5b37e14cc50fe9122847d008607fd0f27204340878bc15129e8a",
linux_arm64: "c8468d63f68db9ee21cb78ca53a583743748dc236472e7e903a2bed50ed5b1e6",
darwin_arm64: "3e6ac933d08d5e640ca89252808d661054f6b7c0d5749cb46f618165154fd809",
darwin_x86_64: "9ed82db050f950bbeb992310aabd6dfac0cd6e5b65724d6ff2afa30e28b890bf",
windows_arm64: "f435008eb63582744f21d0087c8f84442d911606d45fccb7bfd6ee9a8045ca28",
linux_x86_64: "6a2c10b77a275ebd379acc27281de6cbf90402aab7ca6e1cc76ad083b7f55e99"
};
}
});
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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() {
Expand All @@ -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) {
Expand All @@ -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;
Expand Down Expand Up @@ -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() {
Expand All @@ -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) {
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion vsts/QodanaScan/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"version": {
"Major": 2024,
"Minor": 1,
"Patch": 4
"Patch": 5
},
"instanceNameFormat": "Qodana Scan",
"inputs": [
Expand Down
2 changes: 1 addition & 1 deletion vsts/vss-extension.dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifestVersion": 1,
"id": "qodana-dev",
"name": "Qodana (Dev)",
"version": "2024.1.4",
"version": "2024.1.5",
"publisher": "JetBrains",
"targets": [
{
Expand Down
2 changes: 1 addition & 1 deletion vsts/vss-extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifestVersion": 1,
"id": "qodana",
"name": "Qodana",
"version": "2024.1.4",
"version": "2024.1.5",
"public": true,
"publisher": "JetBrains",
"targets": [
Expand Down

0 comments on commit 32840fd

Please sign in to comment.