Upgrade project from JDK 11 to JDK 17

.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

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
 

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

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'
 }
@@ -11,7 +11,7 @@ version '1.12.0-SNAPSHOT'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
@@ -23,18 +23,18 @@ 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 {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 

gradle.properties

@@ -1,3 +1,3 @@
 # Java version configuration
 # Explicitly set Java version requirement
-java.version=11
+java.version=17

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