Skip to content

Commit 7d063f4

Browse files
authored
Merge pull request #148 from overpas/#147/update-ij-kotlin-compose-jewel
#147/update ij kotlin compose jewel
2 parents 92f05a3 + b1409e1 commit 7d063f4

File tree

7 files changed

+36
-12
lines changed

7 files changed

+36
-12
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626
uses: actions/setup-java@v5
2727
with:
2828
distribution: ${{ matrix.jdk }}
29-
java-version: 17
29+
java-version: 21
3030
- name: Build
3131
run: ./gradlew build

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
steps:
1212
- name: Check out code
1313
uses: actions/checkout@v5
14-
- name: Set up JDK 17
14+
- name: Set up JDK 21
1515
uses: actions/setup-java@v5
1616
with:
1717
distribution: zulu
18-
java-version: 17
18+
java-version: 21
1919
- name: Publish to Jetbrains Marketplace
2020
run: ./gradlew publishPlugin
2121
env:

.github/workflows/verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v5
16-
- name: Set up JDK 17
16+
- name: Set up JDK 21
1717
uses: actions/setup-java@v5
1818
with:
1919
distribution: zulu
20-
java-version: 17
20+
java-version: 21
2121
- name: Check IDE compatibility
2222
run: ./gradlew verifyPlugin
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="svg-to-compose-intellij [runIde]" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="runIde" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
jvm-version=21
33
org.gradle.jvmargs=-Xmx8g
44
# Plugin
5-
version=0.20
5+
version=0.21
66
platform-type=IC
77
platform-version=251.25410.59
88
since-build=242
99
until-build=252.*
10-
change-notes=Update to intellij 2025.2
10+
change-notes=Move preview after default
1111
plugin-id=by.overpass.svg-to-compose-intellij
1212
plugin-name=Svg to Compose
1313
vendor-name=overpass

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
2-
kotlin = "2.1.20"
3-
intellij-platform = "2.5.0"
2+
kotlin = "2.2.10"
3+
intellij-platform = "2.7.2"
44
detekt = "1.23.8"
55
junit = "4.13.2"
66
kotlin-coroutines = "1.10.2"
77
svg-to-compose = "0.11.0"
88
mockito-kotlin = "6.0.0"
99
jewel = "0.27.0"
10-
compose-desktop = "1.7.3"
10+
compose-desktop = "1.9.0-rc01"
1111
file-picker = "3.1.0"
1212
turbine = "1.2.1"
1313
detekt-compose-rules = "1.4.0"
14-
lifecycle = "2.8.7"
14+
lifecycle = "2.9.2"
1515

1616
[libraries]
1717
svg-to-compose = { group = "com.github.DevSrSouza", name = "svg-to-compose", version.ref = "svg-to-compose" }

src/main/kotlin/by/overpass/svgtocomposeintellij/preview/ComposeImageVectorPreviewEditorProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class ComposeImageVectorPreviewEditorProvider : FileEditorProvider, DumbAware {
6161

6262
override fun getEditorTypeId(): String = "compose-image-vector-preview-editor"
6363

64-
override fun getPolicy(): FileEditorPolicy = FileEditorPolicy.HIDE_DEFAULT_EDITOR
64+
override fun getPolicy(): FileEditorPolicy = FileEditorPolicy.PLACE_AFTER_DEFAULT_EDITOR
6565

6666
private fun VirtualFile.containsImageVector(): Boolean {
6767
return inputStream

0 commit comments

Comments
 (0)