Java 21 (#112)

* bump mockito

* bumped compile to jdk 21

* fixed build and some optimizations

* bumped jacoco maven-plugin version

.github/workflows/build.yml

@@ -18,11 +18,11 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - name: Set up JDK 19
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '19'
-        distribution: 'temurin'
+        java-version: '21'
+        distribution: 'oracle' # prefering temurin but no jdk 21 support right now
         cache: maven
     - name: Build with Maven
       run: mvn -B package --file pom.xml

pom.xml

@@ -12,8 +12,8 @@
     </scm>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.target>19</maven.compiler.target>
-        <maven.compiler.source>19</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
         <sonar.organization>srcimon</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
@@ -87,7 +87,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-junit-jupiter</artifactId>
-                <version>5.4.0</version>
+                <version>5.5.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -108,7 +108,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.8</version>
+                    <version>0.8.10</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -126,6 +126,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>-Dnet.bytebuddy.experimental=true</argLine><!-- fixes Mockito mocking problems with jdk 21-->
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

screwbox-core/src/main/java/io/github/srcimon/screwbox/core/loop/internal/DefaultLoop.java

@@ -6,8 +6,6 @@
 
 import java.util.List;
 
-import static java.lang.Math.min;
-
 public class DefaultLoop implements Loop {
 
     private static final int CRITICAL_FPS_COUNT = 10;

screwbox-core/src/main/java/io/github/srcimon/screwbox/core/window/internal/DefaultWindow.java

@@ -1,7 +1,6 @@
 package io.github.srcimon.screwbox.core.window.internal;
 
 import io.github.srcimon.screwbox.core.graphics.*;
-import io.github.srcimon.screwbox.core.graphics.Size;
 import io.github.srcimon.screwbox.core.graphics.Frame;
 import io.github.srcimon.screwbox.core.graphics.GraphicsConfiguration;
 import io.github.srcimon.screwbox.core.graphics.internal.*;

screwbox-core/src/test/java/io/github/srcimon/screwbox/core/audio/internal/DefaultAudioTest.java

@@ -21,7 +21,6 @@
 import java.util.concurrent.Executors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 @Timeout(1)

screwbox-core/src/test/java/io/github/srcimon/screwbox/core/entities/EntityTest.java

@@ -12,7 +12,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 class EntityTest {

screwbox-core/src/test/java/io/github/srcimon/screwbox/core/entities/systems/ReflectionRenderSystemTest.java

@@ -25,7 +25,6 @@
 import static io.github.srcimon.screwbox.core.Vector.$;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.Offset.offset;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 @ExtendWith({ EntitiesExtension.class, MockitoExtension.class })

screwbox-core/src/test/java/io/github/srcimon/screwbox/core/graphics/internal/SeparateThreadRendererTest.java

@@ -12,7 +12,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)

screwbox-core/src/test/java/io/github/srcimon/screwbox/core/log/internal/DefaultLogTest.java

@@ -11,7 +11,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)

screwbox-core/src/test/java/io/github/srcimon/screwbox/core/scenes/DefaultLoadingSceneTest.java

@@ -7,7 +7,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(EntitiesExtension.class)

screwbox-core/src/test/java/io/github/srcimon/screwbox/core/scenes/internal/DefaultScenesTest.java

@@ -18,7 +18,6 @@
 import static io.github.srcimon.screwbox.core.test.TestUtil.shutdown;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 @Timeout(1)

screwbox-core/src/test/java/io/github/srcimon/screwbox/core/test/EntitiesExtension.java

@@ -16,7 +16,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 public class EntitiesExtension implements Extension, BeforeEachCallback, ParameterResolver {

screwbox-core/src/test/java/io/github/srcimon/screwbox/core/ui/internal/DefaultUiTest.java

@@ -14,7 +14,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)

screwbox-tiled/src/main/java/io/github/srcimon/screwbox/tiled/Properties.java

@@ -23,9 +23,7 @@ public class Properties {
 
     public Optional<String> get(final String name) {
         final Optional<Property> property = findProperty(name);
-        return property.isPresent()
-                ? Optional.of(property.get().get())
-                : Optional.empty();
+        return property.map(Property::get);
     }
 
     private Optional<Property> findProperty(final String name) {