From 7f6bbef0b24dab2a283b9604a09d73a232565234 Mon Sep 17 00:00:00 2001
From: chylex <contact@chylex.com>
Date: Thu, 5 Oct 2023 13:02:15 +0200
Subject: [PATCH] Update IDEA to 2023.2
---
build.gradle.kts | 38 ++++++++++++++++++--------
src/main/resources/META-INF/plugin.xml | 1 -
2 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 167dff0..7a6f4fa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,24 +1,22 @@
+@file:Suppress("ConvertLambdaToReference")
+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
- kotlin("jvm") version "1.5.10"
- id("org.jetbrains.intellij") version "1.2.0"
+ kotlin("jvm") version "1.8.0"
+ id("org.jetbrains.intellij") version "1.15.0"
}
group = "com.chylex.intellij.keyboardmaster"
version = "0.2.1"
repositories {
- mavenCentral()
-}
-
-dependencies {
- testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.0")
- testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+ mavenCentral()
}
intellij {
- version.set("2021.2.2")
+ type.set("IU")
+ version.set("2023.2")
updateSinceUntilBuild.set(false)
if (System.getenv("IDEAVIM") == "1") {
@@ -26,6 +24,24 @@ intellij {
}
}
-tasks.withType<KotlinCompile> {
- kotlinOptions.jvmTarget = "11"
+kotlin {
+ jvmToolchain(17)
+}
+
+dependencies {
+ testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
+}
+
+tasks.patchPluginXml {
+ sinceBuild.set("232")
+}
+
+tasks.test {
+ useJUnitPlatform()
+}
+
+tasks.withType<KotlinCompile> {
+ kotlinOptions.freeCompilerArgs = listOf(
+ "-Xjvm-default=all"
+ )
}
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 6164bbc..47f7f3a 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -2,7 +2,6 @@
<id>com.chylex.intellij.keyboardmaster.KeyboardMaster</id>
<name>Keyboard Master</name>
<vendor url="https://chylex.com">chylex</vendor>
- <idea-version since-build="212.5284" />
<description><![CDATA[
Collection of keyboard-centric additions.