diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0b6859..b9d0517 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: zulu - java-version: 11 + java-version: 17 cache: gradle # Set environment variables diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0bcf2d5..2b625fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: zulu - java-version: 11 + java-version: 17 cache: gradle # Set environment variables diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index 3108cf1..7416d54 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -40,7 +40,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: zulu - java-version: 11 + java-version: 17 cache: gradle # Run IDEA prepared for UI testing diff --git a/gradle.properties b/gradle.properties index 1c377a0..7403952 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,19 +8,19 @@ pluginVersion = 0.1.4 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild = 222 +pluginSinceBuild = 223 pluginUntilBuild = 223.* # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties platformType = IC -platformVersion = 2022.2 +platformVersion = 2022.3 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformPlugins = # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3 -javaVersion = 11 +javaVersion = 17 # Gradle Releases -> https://github.com/gradle/gradle/releases gradleVersion = 7.5 diff --git a/src/main/kotlin/com/scaventz/window/ComparatorForm.kt b/src/main/kotlin/com/scaventz/window/ComparatorForm.kt index 0316969..3ba5d85 100644 --- a/src/main/kotlin/com/scaventz/window/ComparatorForm.kt +++ b/src/main/kotlin/com/scaventz/window/ComparatorForm.kt @@ -20,13 +20,13 @@ import com.intellij.ui.DocumentAdapter import com.intellij.ui.dsl.builder.* import com.intellij.ui.dsl.gridLayout.HorizontalAlign import com.intellij.ui.dsl.gridLayout.VerticalAlign -import com.intellij.util.castSafelyTo import com.scaventz.services.Kotlinc import java.io.File import javax.swing.JButton import javax.swing.JPanel import javax.swing.event.DocumentEvent import com.intellij.ui.dsl.builder.bindSelected +import com.intellij.util.asSafely import com.scaventz.data.Decompiled import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -108,7 +108,7 @@ open class ComparatorForm(private val project: Project) { var result2: Decompiled? = null var request: ContentDiffRequest? = null val editorManager = FileEditorManager.getInstance(project) - val editor = editorManager.selectedTextEditor.castSafelyTo() ?: throw RuntimeException() + val editor = editorManager.selectedTextEditor.asSafely() ?: throw RuntimeException() val psi = getKtFile(editor.virtualFile) val relativePath = psi.packageFqName.asString().replace('.', '/')