From f471288f589f79bc95458bde3c20249413c2037b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 2 Jul 2025 20:27:31 +0000 Subject: [PATCH 1/5] Initial plan From 08ea643c0eb79a7784c7a835ed4a5ead35e4dcd8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 2 Jul 2025 20:35:30 +0000 Subject: [PATCH 2/5] Upgrade project from JDK 11 to JDK 17 Co-authored-by: ehmkah <6233328+ehmkah@users.noreply.github.com> --- .github/workflows/gradle-test.yml | 4 ++-- CHANGELOG.md | 3 ++- README.adoc | 2 +- build.gradle | 6 +++--- gradle.properties | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle-test.yml b/.github/workflows/gradle-test.yml index 9a9893c..932347e 100644 --- a/.github/workflows/gradle-test.yml +++ b/.github/workflows/gradle-test.yml @@ -8,10 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Build with Gradle run: ./gradlew build diff --git a/CHANGELOG.md b/CHANGELOG.md index bb0745b..d15ae5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog ## [Unreleased] -- Configure Gradle build to explicitly specify JDK 11 requirements for better IDE integration +- Upgrade project to JDK 17 from JDK 11 +- Configure Gradle build to explicitly specify JDK 17 requirements for better IDE integration - update dependencies - upgrade to gradle 7.3 diff --git a/README.adoc b/README.adoc index 2914bcb..285c42e 100644 --- a/README.adoc +++ b/README.adoc @@ -27,7 +27,7 @@ This is an experimentel feature. * Current build state : image:https://github.com/ehmkah/imgdiff/actions/workflows/gradle-test.yml/badge.svg[link="https://github.com/ehmkah/imgdiff/actions/workflows/gradle-test.yml/badge.svg"] === Requirements -* Java 11 or higher (project is configured to use Java 11) +* Java 17 or higher (project is configured to use Java 17) === Setup * Import to intellij with gradle diff --git a/build.gradle b/build.gradle index 3c62145..5267faf 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ version '1.12.0-SNAPSHOT' java { toolchain { - languageVersion = JavaLanguageVersion.of(11) + languageVersion = JavaLanguageVersion.of(17) } } @@ -28,13 +28,13 @@ dependencies { compileKotlin { kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } compileTestKotlin { kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } } diff --git a/gradle.properties b/gradle.properties index a25a49a..78302cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ # Java version configuration # Explicitly set Java version requirement -java.version=11 \ No newline at end of file +java.version=17 \ No newline at end of file From 9513e71aa8c8de71030161d7322c8cfc45e9193c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 2 Jul 2025 20:43:51 +0000 Subject: [PATCH 3/5] Fix Kotlin JVM target compatibility: change from 17 to 16 Co-authored-by: ehmkah <6233328+ehmkah@users.noreply.github.com> --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5267faf..53a4802 100644 --- a/build.gradle +++ b/build.gradle @@ -28,13 +28,13 @@ dependencies { compileKotlin { kotlinOptions { - jvmTarget = "17" + jvmTarget = "16" } } compileTestKotlin { kotlinOptions { - jvmTarget = "17" + jvmTarget = "16" } } From d8ad2e09ac98f9cc459c1101c095d8326b01ce99 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 2 Jul 2025 20:49:35 +0000 Subject: [PATCH 4/5] Upgrade Kotlin to 1.6.0 to support JVM target 17 Co-authored-by: ehmkah <6233328+ehmkah@users.noreply.github.com> --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 53a4802..7b5e4f5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version "1.5.21" + id 'org.jetbrains.kotlin.jvm' version "1.6.0" id 'org.jetbrains.intellij' version '1.1.4' id 'org.jetbrains.changelog' version '1.2.1' } @@ -28,13 +28,13 @@ dependencies { compileKotlin { kotlinOptions { - jvmTarget = "16" + jvmTarget = "17" } } compileTestKotlin { kotlinOptions { - jvmTarget = "16" + jvmTarget = "17" } } From 37ee72bd3c2a218004a65faea5b51679c0fd9cee Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 2 Jul 2025 20:57:35 +0000 Subject: [PATCH 5/5] Upgrade Mockito to support JDK 17: update from mockito-kotlin 2.2.0 to 4.1.0 Co-authored-by: ehmkah <6233328+ehmkah@users.noreply.github.com> --- build.gradle | 2 +- .../ehmkah/projects/imgdiff/ImgDiffBaseBinaryDiffToolTest.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 7b5e4f5..804d410 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ dependencies { implementation 'com.squareup:gifencoder:0.10.1' testImplementation('org.junit.jupiter:junit-jupiter:5.7.2') - testImplementation('com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0') + testImplementation('org.mockito.kotlin:mockito-kotlin:4.1.0') } compileKotlin { diff --git a/src/test/kotlin/de/ehmkah/projects/imgdiff/ImgDiffBaseBinaryDiffToolTest.kt b/src/test/kotlin/de/ehmkah/projects/imgdiff/ImgDiffBaseBinaryDiffToolTest.kt index 9043588..3da7bea 100644 --- a/src/test/kotlin/de/ehmkah/projects/imgdiff/ImgDiffBaseBinaryDiffToolTest.kt +++ b/src/test/kotlin/de/ehmkah/projects/imgdiff/ImgDiffBaseBinaryDiffToolTest.kt @@ -4,8 +4,8 @@ import com.intellij.diff.contents.DiffContent import com.intellij.diff.contents.FileContentImpl import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.vfs.VirtualFile -import com.nhaarman.mockitokotlin2.doReturn -import com.nhaarman.mockitokotlin2.mock +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock import org.junit.Test import kotlin.test.assertFalse import kotlin.test.assertTrue