Skip to content

Commit f1427d2

Browse files
committed
BREAKING CHANGE: Use ij-platform 242 with java 21 (#156)
fix missing kotlin.jvmToolchain upgrade
1 parent 89b6b45 commit f1427d2

File tree

9 files changed

+22
-19
lines changed

9 files changed

+22
-19
lines changed

.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
uses: actions/setup-java@v4
5757
with:
5858
distribution: zulu
59-
java-version: 17
59+
java-version: 21
6060

6161
# Setup Gradle
6262
- name: Setup Gradle
@@ -125,7 +125,7 @@ jobs:
125125
uses: actions/setup-java@v4
126126
with:
127127
distribution: zulu
128-
java-version: 17
128+
java-version: 21
129129

130130
# Setup Gradle
131131
- name: Setup Gradle
@@ -178,7 +178,7 @@ jobs:
178178
uses: actions/setup-java@v4
179179
with:
180180
distribution: zulu
181-
java-version: 17
181+
java-version: 21
182182

183183
# Run Qodana inspections
184184
- name: Qodana - Code Inspection
@@ -208,7 +208,7 @@ jobs:
208208
uses: actions/setup-java@v4
209209
with:
210210
distribution: zulu
211-
java-version: 17
211+
java-version: 21
212212

213213
# Setup Gradle
214214
- name: Setup Gradle
@@ -249,7 +249,7 @@ jobs:
249249
uses: actions/setup-java@v4
250250
with:
251251
distribution: zulu
252-
java-version: 17
252+
java-version: 21
253253

254254
# Setup Gradle
255255
- name: Setup Gradle

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/setup-java@v4
3636
with:
3737
distribution: zulu
38-
java-version: 17
38+
java-version: 21
3939

4040
# Setup Gradle
4141
- name: Setup Gradle

.github/workflows/run-ui-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/setup-java@v4
4141
with:
4242
distribution: zulu
43-
java-version: 17
43+
java-version: 21
4444

4545
# Setup Gradle
4646
- name: Setup Gradle

build.gradle.kts

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ version = providers.gradleProperty("pluginVersion").get()
2424

2525
// Set the JVM language level used to build the project.
2626
kotlin {
27-
jvmToolchain(17)
27+
jvmToolchain(21)
2828
}
2929

3030
// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
3131
dependencies {
3232
testImplementation(libs.junit)
3333

3434
intellijPlatform {
35-
create(IntelliJPlatformType.IntellijIdeaCommunity, "2022.3.3", false)
35+
create(IntelliJPlatformType.IntellijIdeaCommunity, providers.gradleProperty("platformVersion"), false)
3636

3737
pluginModule(implementation(project(":mise-products-goland")))
3838
pluginModule(implementation(project(":mise-products-gradle")))
@@ -106,7 +106,7 @@ intellijPlatform {
106106

107107
pluginVerification {
108108
ides {
109-
// recommended()
109+
recommended()
110110
}
111111
}
112112

@@ -166,7 +166,7 @@ allprojects {
166166

167167
tasks.withType<Detekt>().configureEach {
168168
enabled = false
169-
jvmTarget = "17"
169+
jvmTarget = "21"
170170
reports {
171171
xml.required = true
172172
html.required = true
@@ -179,7 +179,7 @@ allprojects {
179179
input.from(tasks.withType<Detekt>().map { it.reports.sarif.outputLocation })
180180
}
181181
tasks.withType<DetektCreateBaselineTask>().configureEach {
182-
jvmTarget = "17"
182+
jvmTarget = "21"
183183
}
184184
}
185185

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ pluginRepositoryUrl = https://github.com/134130/intellij-mise
77
pluginVersion=3.5.0
88

99
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
10-
pluginSinceBuild=233
11-
platformVersion=2023.3.6
10+
pluginSinceBuild=242
11+
platformVersion=2024.2
1212

1313
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1414
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

mise.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[tools]
2-
java = '17'
2+
java = '21'

modules/core/src/main/kotlin/com/github/l34130/mise/core/MiseErrorReportSubmitter.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.github.l34130.mise.core
33
import com.github.l34130.mise.core.command.MiseCommandLine
44
import com.github.l34130.mise.core.notification.MiseNotificationService
55
import com.intellij.diagnostic.AbstractMessage
6+
import com.intellij.diagnostic.LogMessage
67
import com.intellij.diagnostic.PluginException
78
import com.intellij.ide.DataManager
89
import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -45,7 +46,7 @@ class MiseErrorReportSubmitter : ErrorReportSubmitter() {
4546
val description = additionalInfo ?: ""
4647
var attachments = listOf<Attachment>()
4748

48-
if (event.data is AbstractMessage) {
49+
if (event.data is LogMessage) {
4950
throwable = (event.data as AbstractMessage).throwable
5051
attachments = (event.data as AbstractMessage).includedAttachments
5152
}

modules/core/src/main/kotlin/com/github/l34130/mise/core/util/TerminalUtils.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.github.l34130.mise.core.util
22

3+
import com.github.l34130.mise.core.baseDirectory
34
import com.intellij.openapi.components.service
45
import com.intellij.openapi.project.Project
56
import com.intellij.openapi.wm.ToolWindowManager
7+
import org.jetbrains.plugins.terminal.ShellTerminalWidget
68
import org.jetbrains.plugins.terminal.TerminalToolWindowFactory
79
import org.jetbrains.plugins.terminal.TerminalToolWindowManager
810

@@ -12,8 +14,8 @@ object TerminalUtils {
1214
command: String,
1315
tabName: String? = null,
1416
) {
15-
val widget =
16-
project.service<TerminalToolWindowManager>().createLocalShellWidget(project.basePath, tabName ?: "Mise")
17+
val shellWidget = project.service<TerminalToolWindowManager>().createShellWidget(project.baseDirectory(), tabName ?: "Mise", true, true)
18+
val widget = ShellTerminalWidget.toShellJediTermWidgetOrThrow(shellWidget)
1719

1820
project
1921
.service<ToolWindowManager>()

qodana.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
version: 1.0
55
linter: jetbrains/qodana-jvm-community:latest
6-
projectJDK: "17"
6+
projectJDK: "21"
77
profile:
88
name: qodana.recommended
99
exclude:

0 commit comments

Comments
 (0)