From 3bfe7f5e7719e3dfc9bf22fb3c2b6354c8cc4831 Mon Sep 17 00:00:00 2001 From: "Dutkowski, Bernd" Date: Tue, 10 Jan 2023 14:21:09 +0100 Subject: [PATCH 1/6] Update for Intellij 2022.3.1 update Java to 17 update Kotlin to 1.7.22 update gradle plugin 'org.jetbrains.intellij' to 1.11.0 --- build.gradle.kts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d477a04..6a3661e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,19 +1,17 @@ plugins { - id("org.jetbrains.intellij") version "1.9.0" + id("org.jetbrains.intellij") version "1.11.0" java - kotlin("jvm") version "1.6.20" + kotlin("jvm") version "1.7.22" } group "com.asyncapi.plugin.idea" -version = "1.7.1+idea2021" +version = "1.7.1+idea2022" repositories { mavenCentral() } dependencies { - implementation(kotlin("stdlib")) - testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7") testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0") testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.0") @@ -21,12 +19,12 @@ dependencies { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version.set("2022.2.3") + version.set("2022.3.1") plugins.set(listOf("yaml")) } tasks.getByName("patchPluginXml") { - sinceBuild.set("211") - untilBuild.set("222.*") + sinceBuild.set("223") + untilBuild.set("223.*") changeNotes.set("""

Fix preview on Windows

""".trimIndent()) @@ -54,19 +52,21 @@ tasks.getByName("runPluginVe "2022.2", "2022.2.1", "2022.2.2", - "2022.2.3" + "2022.2.3", + "2022.3", + "2022.3.1" )) verifierVersion.set("1.284") } tasks { compileKotlin { - kotlinOptions.jvmTarget = "11" + kotlinOptions.jvmTarget = "17" } compileTestKotlin { - kotlinOptions.jvmTarget = "11" + kotlinOptions.jvmTarget = "17" } test { useJUnitPlatform() } -} \ No newline at end of file +} From 8f3e9d4b3d1330613a7ea6795b22024097355b34 Mon Sep 17 00:00:00 2001 From: "Dutkowski, Bernd" Date: Tue, 10 Jan 2023 21:14:51 +0100 Subject: [PATCH 2/6] Add Version "2022.2.4" to Plugin Verifier Task --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index 6a3661e..b5c15dd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -53,6 +53,7 @@ tasks.getByName("runPluginVe "2022.2.1", "2022.2.2", "2022.2.3", + "2022.2.4", "2022.3", "2022.3.1" )) From cab3a564f611a35519b8c972ef9fb6c30a227981 Mon Sep 17 00:00:00 2001 From: "Dutkowski, Bernd" Date: Tue, 10 Jan 2023 21:24:38 +0100 Subject: [PATCH 3/6] Bump version to 1.8.0 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b5c15dd..5599480 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group "com.asyncapi.plugin.idea" -version = "1.7.1+idea2022" +version = "1.8.0+idea2022" repositories { mavenCentral() From 1f974782ee7cc0513aa177d0a6f11430eba28424 Mon Sep 17 00:00:00 2001 From: "Dutkowski, Bernd" Date: Tue, 10 Jan 2023 21:48:19 +0100 Subject: [PATCH 4/6] set jvm toolchain version to 17 --- build.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 5599480..37b1e65 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -71,3 +71,9 @@ tasks { useJUnitPlatform() } } + +kotlin { + jvmToolchain { + this.languageVersion.set(JavaLanguageVersion.of(17)) + } +} From d2dd98a417baef1381fbe63b8cff7ab82bac92b5 Mon Sep 17 00:00:00 2001 From: "Dutkowski, Bernd" Date: Tue, 10 Jan 2023 22:27:41 +0100 Subject: [PATCH 5/6] Bump version to 1.8.1 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 37b1e65..94e24db 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group "com.asyncapi.plugin.idea" -version = "1.8.0+idea2022" +version = "1.8.1+idea2022" repositories { mavenCentral() From cbe848129dd8684280f94cfec59db39ce7672f38 Mon Sep 17 00:00:00 2001 From: "Dutkowski, Bernd" Date: Sun, 22 Jan 2023 22:38:41 +0100 Subject: [PATCH 6/6] Update gradle-intellij-plugin to 1.12.0 and Kotlin to 1.8.0 --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 94e24db..5e9c601 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - id("org.jetbrains.intellij") version "1.11.0" + id("org.jetbrains.intellij") version "1.12.0" java - kotlin("jvm") version "1.7.22" + kotlin("jvm") version "1.8.0" } group "com.asyncapi.plugin.idea"