Clean up JDK-8 related code (#2883)

Fixes #2879 Signed-off-by: Andriy Redko <drreta@gmail.com>
mockito · Jan 24, 2023 · 4775c67 · 4775c67
1 parent 91223f8
commit 4775c67
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 713 deletions.
diff --git a/build.gradle b/build.gradle
@@ -99,7 +99,7 @@ dependencies {
     testUtil sourceSets.test.output
 
     signature 'org.codehaus.mojo.signature:java18:1.0@signature'
-    signature 'net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature'
+    signature 'net.sf.androidscents.signature:android-api-level-26:8.0.0_r2@signature'
 }
 
 animalsniffer {

diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMaker.java b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineDelegateByteBuddyMockMaker.java
@@ -447,9 +447,7 @@ private <T> RuntimeException prettifyFailure(
                                 "IBM J9 VM",
                                 "Early IBM virtual machine are known to have issues with Mockito, please upgrade to an up-to-date version.\n",
                                 "Hotspot",
-                                Platform.isJava8BelowUpdate45()
-                                        ? "Java 8 early builds have bugs that were addressed in Java 1.8.0_45, please update your JDK!\n"
-                                        : ""),
+                                ""),
                         Platform.describe(),
                         "",
                         "You are seeing this disclaimer because Mockito is configured to create inlined mocks.",

diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMaker.java b/src/main/java/org/mockito/internal/creation/bytebuddy/SubclassByteBuddyMockMaker.java
@@ -122,9 +122,7 @@ private <T> RuntimeException prettifyFailure(
                                 "IBM J9 VM",
                                 "Early IBM virtual machine are known to have issues with Mockito, please upgrade to an up-to-date version.\n",
                                 "Hotspot",
-                                Platform.isJava8BelowUpdate45()
-                                        ? "Java 8 early builds have bugs that were addressed in Java 1.8.0_45, please update your JDK!\n"
-                                        : ""),
+                                ""),
                         Platform.describe(),
                         "",
                         "Underlying exception : " + generationFailed),

diff --git a/src/main/java/org/mockito/internal/debugging/Java8LocationImpl.java b/src/main/java/org/mockito/internal/debugging/Java8LocationImpl.java
diff --git a/src/main/java/org/mockito/internal/debugging/Java9PlusLocationImpl.java b/src/main/java/org/mockito/internal/debugging/Java9PlusLocationImpl.java