Skip to content

Commit 1c18894

Browse files
Merge pull request #3149 from Kilo-Org/catrielmuller/upgrade-jetbrains-framework
Jetbrains - Update jetbrains plugin framework
2 parents 476d835 + 79c7d60 commit 1c18894

File tree

148 files changed

+4569
-3931
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+4569
-3931
lines changed

.changeset/real-bottles-smoke.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"kilo-code": patch
3+
---
4+
5+
Jetbrains - Update framework (Plugin now requires IntelliJ IDEA 2024.3 or later)

.github/workflows/code-qa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
- uses: actions/setup-java@v4
162162
with:
163163
distribution: 'jetbrains'
164-
java-version: '17'
164+
java-version: '21'
165165
- name: Install system dependencies
166166
run: |
167167
sudo apt-get update

.github/workflows/marketplace-publish.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
- uses: actions/setup-java@v4
134134
with:
135135
distribution: "jetbrains"
136-
java-version: "17"
136+
java-version: "21"
137137
- name: Install system dependencies
138138
run: |
139139
sudo apt-get update
@@ -173,14 +173,13 @@ jobs:
173173
with:
174174
name: ${{ env.BUNDLE_NAME }}
175175
path: jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}
176-
# Disabled while we figure out why our JetBrains builds are no longer being approved.
177-
#- name: JetBrains Marketplace Publisher
178-
# run: |
179-
# curl \
180-
# -X POST \
181-
# -H "Authorization: Bearer ${{ secrets.JETBRAINS_MARKETPLACE_TOKEN }}" \
182-
# -F "file=@jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}" \
183-
# -F "pluginId=28350" \
184-
# -F "channel=stable" \
185-
# -F "isHidden=false" \
186-
# https://plugins.jetbrains.com/plugin/uploadPlugin
176+
- name: JetBrains Marketplace Publisher
177+
run: |
178+
curl \
179+
-X POST \
180+
-H "Authorization: Bearer ${{ secrets.JETBRAINS_MARKETPLACE_TOKEN }}" \
181+
-F "file=@jetbrains/plugin/build/distributions/${{ env.BUNDLE_NAME }}" \
182+
-F "pluginId=28350" \
183+
-F "channel=stable" \
184+
-F "isHidden=false" \
185+
https://plugins.jetbrains.com/plugin/uploadPlugin

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
"markdown.editor.filePaste.copyIntoWorkspace": "mediaFiles",
2424
"markdown.copyFiles.destination": {
2525
"**/*": "/static/img/${documentBaseName}/${documentBaseName}.${fileName/(.*)\\.(.*)/$2/}"
26-
}
26+
},
27+
"java.configuration.updateBuildConfiguration": "interactive"
2728
}

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
libnotify
2222
jetbrains.idea-community
2323
jetbrains.jdk
24-
jdk17
24+
jdk21
2525
gradle
2626
unzip
2727
# Build tools for native modules

jetbrains/plugin/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
.gradle
6+
.intellijPlatform/
67
build/
78
!gradle/wrapper/gradle-wrapper.jar
89
!**/src/main/**/build/

0 commit comments

Comments
 (0)