From 75d564689e5ac09eadab96c774773121af9de3ea Mon Sep 17 00:00:00 2001 From: "Juan M.vi" Date: Sun, 30 Aug 2020 18:05:35 -0300 Subject: [PATCH 1/2] DOCS Added reference to requirements to Java 8 support in Android --- src/main/java/org/mockito/Mockito.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/mockito/Mockito.java b/src/main/java/org/mockito/Mockito.java index 64df8b8db7..8ba2fbdb1e 100644 --- a/src/main/java/org/mockito/Mockito.java +++ b/src/main/java/org/mockito/Mockito.java @@ -128,7 +128,9 @@ * * You can continue to run the same unit tests on a regular VM by using the `mockito-core` artifact in your "testCompile" scope as shown * above. Be aware that you cannot use the inline mock maker on Android due to limitations in the Android VM. - * + *

+ * Note that for better Java 8 and Android support you need to update the Android plugin to 3.0.0 (or higher) and set the minSdkVersion to 26 to support method handles. + *

* If you encounter issues with mocking on Android, please open an issue * on the official issue tracker. * Do provide the version of Android you are working on and dependencies of your project. From ec000cf25f1e8924e78e559aec7130f4c676771f Mon Sep 17 00:00:00 2001 From: "Juan M.vi" Date: Tue, 1 Sep 2020 00:40:16 -0300 Subject: [PATCH 2/2] DOCS Added reference to Java 8 support on Android --- src/main/java/org/mockito/Mockito.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/mockito/Mockito.java b/src/main/java/org/mockito/Mockito.java index 8ba2fbdb1e..d6740be990 100644 --- a/src/main/java/org/mockito/Mockito.java +++ b/src/main/java/org/mockito/Mockito.java @@ -127,10 +127,8 @@ * * * You can continue to run the same unit tests on a regular VM by using the `mockito-core` artifact in your "testCompile" scope as shown - * above. Be aware that you cannot use the inline mock maker on Android due to limitations in the Android VM. - *

- * Note that for better Java 8 and Android support you need to update the Android plugin to 3.0.0 (or higher) and set the minSdkVersion to 26 to support method handles. - *

+ * above. Be aware that you cannot use the inline mock maker on Android due to limitations in the Android VM (see Java 8 support). + * * If you encounter issues with mocking on Android, please open an issue * on the official issue tracker. * Do provide the version of Android you are working on and dependencies of your project.