Merge branch 'develop' into build/idea-july02

Author: jdrueckert

build-logic/src/main/kotlin/terasology-module.gradle.kts

@@ -66,7 +66,8 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-    testImplementation("org.mockito:mockito-junit-jupiter:3.7.7")
+    testImplementation("org.mockito:mockito-inline:3.11.2")
+    testImplementation("org.mockito:mockito-junit-jupiter:3.11.2")
 }
 
 
@@ -79,7 +80,7 @@ if (project.name == "ModuleTestingEnvironment") {
         }
         add("implementation", platform("org.junit:junit-bom:5.7.1"))
         implementation("org.junit.jupiter:junit-jupiter-api")
-        implementation("org.mockito:mockito-junit-jupiter:3.7.7")
+        implementation("org.mockito:mockito-junit-jupiter:3.11.2")
     }
 }
 

engine-tests/build.gradle

@@ -68,9 +68,9 @@ dependencies {
     implementation("org.junit.jupiter:junit-jupiter-api")
     implementation("org.junit.jupiter:junit-jupiter-params")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testImplementation("org.mockito:mockito-inline:3.7.7")
+    testImplementation("org.mockito:mockito-inline:3.11.2")
 
-    implementation("org.mockito:mockito-junit-jupiter:3.7.7")
+    implementation("org.mockito:mockito-junit-jupiter:3.11.2")
 
     implementation("org.terasology.joml-ext:joml-test:0.1.0")
 

subsystems/TypeHandlerLibrary/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.5.2")
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.5.2")
-    testImplementation("org.mockito:mockito-junit-jupiter:3.2.0")
+    testImplementation("org.mockito:mockito-junit-jupiter:3.11.2")
 
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2")
 }