From 0e8ba19c8c089db76b9558e7f7a2305d5d80e790 Mon Sep 17 00:00:00 2001 From: Thomas Schouten Date: Tue, 25 Jul 2023 21:53:31 +0200 Subject: [PATCH] Update to Kotlin 1.9 --- build.gradle.kts | 6 +++--- .../run/latex/logtab/ui/LatexErrorTreeViewConfiguration.kt | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 38e0f6975..61dae86fb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,8 +10,8 @@ fun properties(key: String) = project.findProperty(key).toString() // Supersedes the use of "buildscript" block and "apply plugin:" plugins { id("org.jetbrains.intellij") version "1.15.0" - kotlin("jvm") version ("1.8.0") - kotlin("plugin.serialization") version ("1.8.0") + kotlin("jvm") version ("1.9.0") + kotlin("plugin.serialization") version ("1.9.0") // Plugin which can check for Gradle dependencies, use the help/dependencyUpdates task. id("com.github.ben-manes.versions") version "0.47.0" @@ -270,7 +270,7 @@ tasks.jar { // https://github.com/ben-manes/gradle-versions-plugin fun isNonStable(version: String): Boolean { - val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) } + val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) } val regex = "^[0-9,.v-]+(-r)?$".toRegex() val isStable = stableKeyword || regex.matches(version) return isStable.not() diff --git a/src/nl/hannahsten/texifyidea/run/latex/logtab/ui/LatexErrorTreeViewConfiguration.kt b/src/nl/hannahsten/texifyidea/run/latex/logtab/ui/LatexErrorTreeViewConfiguration.kt index d6424f216..35336ce33 100644 --- a/src/nl/hannahsten/texifyidea/run/latex/logtab/ui/LatexErrorTreeViewConfiguration.kt +++ b/src/nl/hannahsten/texifyidea/run/latex/logtab/ui/LatexErrorTreeViewConfiguration.kt @@ -12,7 +12,6 @@ import com.intellij.util.xmlb.XmlSerializerUtil name = "LatexErrorTreeViewConfiguration", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)] ) - @Service(Service.Level.PROJECT) data class LatexErrorTreeViewConfiguration( var showKeywordWarnings: MutableMap = LatexKeywordFilter.values().associateWith { true }.toMutableMap(),