From 6b2bf6debcfeaee67e262aaf11a3c8a637772f14 Mon Sep 17 00:00:00 2001
From: Austine A <8253869+AustineA@users.noreply.github.com>
Date: Tue, 22 Feb 2022 15:33:41 +0100
Subject: [PATCH 1/2] cordova-android 10+ compatibility with JDK 11
Updating the doc to reflect cordova-android 10+ is now compatible with JDK 11
---
docs/developing/android.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/developing/android.md b/docs/developing/android.md
index 66bdbe52b5c..16263693073 100644
--- a/docs/developing/android.md
+++ b/docs/developing/android.md
@@ -104,10 +104,10 @@ Additional setup is required for Cordova to support programmatic builds. This se
### Java
-Native Android apps are compiled with the Java programming language. Download JDK8 from the download page.
+Native Android apps are compiled with the Java programming language. Download JDK11 from the download page.
:::note
-Unfortunately, Cordova is not compatible with the latest version of Java.
+Install Java Development Kit (JDK) 8 if using **cordova-android** version lower than 10
:::
### Gradle
From c42c5a8033ed9ccba9b740ff9ed786e39455e0c7 Mon Sep 17 00:00:00 2001
From: Brandy Carney
Date: Thu, 11 May 2023 12:15:34 -0400
Subject: [PATCH 2/2] docs(developing): update android java steps
---
docs/developing/android.md | 4 ++--
versioned_docs/version-v5/developing/android.md | 4 ++--
versioned_docs/version-v6/developing/android.md | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/developing/android.md b/docs/developing/android.md
index c0415d6ea95..daa73c8a920 100644
--- a/docs/developing/android.md
+++ b/docs/developing/android.md
@@ -112,10 +112,10 @@ Additional setup is required for Cordova to support programmatic builds. This se
### Java
-Native Android apps are compiled with the Java programming language. Download JDK11 from the download page.
+Native Android apps are compiled with the Java programming language. Download the Java Development Kit (JDK) 11 if you are using **`cordova-android`** `10.0.0` or greater.
:::note
-Install Java Development Kit (JDK) 8 if using **cordova-android** version lower than 10
+If you are using any version of **`cordova-android`** below `10.0.0`, install the Java Development Kit (JDK) 8.
:::
### Gradle
diff --git a/versioned_docs/version-v5/developing/android.md b/versioned_docs/version-v5/developing/android.md
index 63d7eef663a..8faf6779d2d 100644
--- a/versioned_docs/version-v5/developing/android.md
+++ b/versioned_docs/version-v5/developing/android.md
@@ -104,10 +104,10 @@ Additional setup is required for Cordova to support programmatic builds. This se
### Java
-Native Android apps are compiled with the Java programming language. Download JDK8 from the download page.
+Native Android apps are compiled with the Java programming language. Download the Java Development Kit (JDK) 11 if you are using **`cordova-android`** `10.0.0` or greater.
:::note
-Unfortunately, Cordova is not compatible with the latest version of Java.
+If you are using any version of **`cordova-android`** below `10.0.0`, install the Java Development Kit (JDK) 8.
:::
### Gradle
diff --git a/versioned_docs/version-v6/developing/android.md b/versioned_docs/version-v6/developing/android.md
index d27d9ae62f2..e52453ab98e 100644
--- a/versioned_docs/version-v6/developing/android.md
+++ b/versioned_docs/version-v6/developing/android.md
@@ -112,10 +112,10 @@ Additional setup is required for Cordova to support programmatic builds. This se
### Java
-Native Android apps are compiled with the Java programming language. Download JDK8 from the download page.
+Native Android apps are compiled with the Java programming language. Download the Java Development Kit (JDK) 11 if you are using **`cordova-android`** `10.0.0` or greater.
:::note
-Unfortunately, Cordova is not compatible with the latest version of Java.
+If you are using any version of **`cordova-android`** below `10.0.0`, install the Java Development Kit (JDK) 8.
:::
### Gradle