From b3f854e551d35ea27bc0a1f92aa6859bd6dfb344 Mon Sep 17 00:00:00 2001 From: Michael Krausse Date: Sat, 25 Jul 2026 21:32:46 +0200 Subject: [PATCH 1/3] update to intellij 26.2 --- CHANGELOG.md | 2 +- build.gradle | 6 +++--- src/main/resources/META-INF/plugin.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c22e1d0..190208d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ - Configure Gradle build to explicitly specify JDK 21 requirements for better IDE integration - update dependencies - upgrade to gradle 9.x -- upgrade to intellij 2025.3 +- upgrade to intellij 2026.2 ## [1.11.0] diff --git a/build.gradle b/build.gradle index 03c19f7..df302e1 100644 --- a/build.gradle +++ b/build.gradle @@ -28,11 +28,11 @@ dependencies { implementation 'com.squareup:gifencoder:0.10.1' intellijPlatform { - intellijIdea('2025.3') + intellijIdea('2026.2') } testImplementation('org.junit.jupiter:junit-jupiter:5.7.2') - testImplementation('org.mockito.kotlin:mockito-kotlin:5.4.0') + testImplementation('org.mockito.kotlin:mockito-kotlin:6.3.0') testImplementation('junit:junit:4.13.2') testImplementation('org.jetbrains.kotlin:kotlin-test:2.3.21') } @@ -40,7 +40,7 @@ dependencies { intellijPlatform { pluginConfiguration { ideaVersion { - sinceBuild.set('253') + sinceBuild.set('262') } changeNotes.set(provider({changelog.renderItem(changelog.getLatest(), Changelog.OutputType.HTML)})) } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 35813e0..665b085 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -8,7 +8,7 @@ I am happy if you report issues, I am going to fix them. ]]> - + com.intellij.modules.lang From 3fa2d96f5b84f51298c2ff1bcd2fac7f293eb986 Mon Sep 17 00:00:00 2001 From: Michael Krausse Date: Sat, 25 Jul 2026 21:51:58 +0200 Subject: [PATCH 2/3] updated more dependencies --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index df302e1..82d41b5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ import org.jetbrains.changelog.Changelog plugins { - id 'org.jetbrains.kotlin.jvm' version "2.3.21" - id 'org.jetbrains.intellij.platform' version '2.14.0' + id 'org.jetbrains.kotlin.jvm' version "2.4.10" + id 'org.jetbrains.intellij.platform' version '2.18.1' id 'org.jetbrains.changelog' version '2.5.0' } @@ -31,10 +31,10 @@ dependencies { intellijIdea('2026.2') } - testImplementation('org.junit.jupiter:junit-jupiter:5.7.2') + testImplementation('org.junit.jupiter:junit-jupiter:6.1.2') testImplementation('org.mockito.kotlin:mockito-kotlin:6.3.0') testImplementation('junit:junit:4.13.2') - testImplementation('org.jetbrains.kotlin:kotlin-test:2.3.21') + testImplementation('org.jetbrains.kotlin:kotlin-test:2.4.10') } intellijPlatform { From af59ec797bfd4c09b0a707f296db9f3612e09bcc Mon Sep 17 00:00:00 2001 From: Michael Krausse Date: Sat, 25 Jul 2026 21:56:37 +0200 Subject: [PATCH 3/3] upgrade to junit5 --- build.gradle | 5 ++++- .../de/ehmkah/projects/imgdiff/DiffedImageCreatorTest.kt | 4 ++-- .../ehmkah/projects/imgdiff/ImgDiffBaseBinaryDiffToolTest.kt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 82d41b5..1f4bc3e 100644 --- a/build.gradle +++ b/build.gradle @@ -33,10 +33,13 @@ dependencies { testImplementation('org.junit.jupiter:junit-jupiter:6.1.2') testImplementation('org.mockito.kotlin:mockito-kotlin:6.3.0') - testImplementation('junit:junit:4.13.2') testImplementation('org.jetbrains.kotlin:kotlin-test:2.4.10') } +test { + useJUnitPlatform() +} + intellijPlatform { pluginConfiguration { ideaVersion { diff --git a/src/test/kotlin/de/ehmkah/projects/imgdiff/DiffedImageCreatorTest.kt b/src/test/kotlin/de/ehmkah/projects/imgdiff/DiffedImageCreatorTest.kt index ac70ae1..a4ce6ab 100644 --- a/src/test/kotlin/de/ehmkah/projects/imgdiff/DiffedImageCreatorTest.kt +++ b/src/test/kotlin/de/ehmkah/projects/imgdiff/DiffedImageCreatorTest.kt @@ -1,7 +1,7 @@ package de.ehmkah.projects.imgdiff -import org.junit.Assert.assertTrue -import org.junit.Test +import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Test import java.awt.image.BufferedImage import java.io.ByteArrayOutputStream import java.io.File diff --git a/src/test/kotlin/de/ehmkah/projects/imgdiff/ImgDiffBaseBinaryDiffToolTest.kt b/src/test/kotlin/de/ehmkah/projects/imgdiff/ImgDiffBaseBinaryDiffToolTest.kt index 3da7bea..dc8d772 100644 --- a/src/test/kotlin/de/ehmkah/projects/imgdiff/ImgDiffBaseBinaryDiffToolTest.kt +++ b/src/test/kotlin/de/ehmkah/projects/imgdiff/ImgDiffBaseBinaryDiffToolTest.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.vfs.VirtualFile import org.mockito.kotlin.doReturn import org.mockito.kotlin.mock -import org.junit.Test +import org.junit.jupiter.api.Test import kotlin.test.assertFalse import kotlin.test.assertTrue