JetBrains OpenJDK 11

Configuration.props

@@ -118,6 +118,10 @@
     <MingwCommandPrefix32>i686-w64-mingw32</MingwCommandPrefix32>
     <MingwCommandPrefix64>x86_64-w64-mingw32</MingwCommandPrefix64>
   </PropertyGroup>
+  <PropertyGroup>
+    <JavacSourceVersion>1.8</JavacSourceVersion>
+    <JavacTargetVersion>1.8</JavacTargetVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <AndroidMxeFullPath Condition=" '$(AndroidMxeInstallPrefix)' != '' ">$([System.IO.Path]::GetFullPath ('$(AndroidMxeInstallPrefix)'))</AndroidMxeFullPath>
     <AndroidNdkFullPath>$([System.IO.Path]::GetFullPath ('$(AndroidNdkDirectory)'))</AndroidNdkFullPath>

build-tools/scripts/Jar.targets

@@ -3,10 +3,6 @@
   <Target Name="_GetJavacVersions"
       DependsOnTargets="AndroidPrepareForBuild">
     <PropertyGroup>
-      <_JavacSourceVersion Condition="$(_JdkVersion.StartsWith ('9'))">1.8</_JavacSourceVersion>
-      <_JavacSourceVersion Condition=" '$(_JavacSourceVersion)' == '' ">1.5</_JavacSourceVersion>
-      <_JavacTargetVersion Condition="$(_JdkVersion.StartsWith ('9'))">1.8</_JavacTargetVersion>
-      <_JavacTargetVersion Condition=" '$(_JavacTargetVersion)' == '' ">1.6</_JavacTargetVersion>
       <JarPath Condition=" '$(JarPath)' == '' ">$(JavaSdkDirectory)\bin\jar</JarPath>
       <JavaCPath Condition=" '$(JavaCPath)' == '' ">$(JavaSdkDirectory)\bin\javac</JavaCPath>
     </PropertyGroup>
@@ -35,7 +31,7 @@
     <PropertyGroup>
       <_Javac>"$(JavaCPath)"</_Javac>
       <_Jar>"$(JarPath)"</_Jar>
-      <_Targets>-source $(_JavacSourceVersion) -target $(_JavacTargetVersion)</_Targets>
+      <_Targets>-source $(JavacSourceVersion) -target $(JavacTargetVersion)</_Targets>
       <_DestDir>$(IntermediateOutputPath)__CreateTestJarFile-bin</_DestDir>
       <_AndroidJar>-bootclasspath "$(AndroidSdkDirectory)\platforms\android-$(_AndroidApiLevelName)\android.jar"</_AndroidJar>
       <_CP>-cp "$(_JavaInteropJarPath)"</_CP>

build-tools/scripts/JavaCallableWrappers.targets

@@ -31,7 +31,7 @@
         Overwrite="True"
     />
     <PropertyGroup>
-      <_Target>-source $(JavacSourceVersion) -target $(JavacSourceVersion)</_Target>
+      <_Target>-source $(JavacSourceVersion) -target $(JavacTargetVersion)</_Target>
       <_D>-d "$(IntermediateOutputPath)jcw\bin"</_D>
       <_AndroidJar>"$(AndroidToolchainDirectory)\sdk\platforms\android-$(AndroidPlatformId)\android.jar"</_AndroidJar>
       <_MonoAndroidJar>$(OutputPath)mono.android.jar</_MonoAndroidJar>

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Linux.cs

@@ -4,6 +4,8 @@ namespace Xamarin.Android.Prepare
 {
 	partial class Configurables
 	{
+		const string JetBrainsOpenJDKOperatingSystem = "linux-x64";
+
 		partial class Urls
 		{
 			public static readonly Uri Corretto = new Uri ($"{Corretto_BaseUri}{CorrettoUrlPathVersion}/amazon-corretto-{CorrettoDistVersion}-linux-x64.tar.gz");

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.MacOS.cs

@@ -4,6 +4,7 @@ namespace Xamarin.Android.Prepare
 {
 	partial class Configurables
 	{
+		const string JetBrainsOpenJDKOperatingSystem = "osx-x64";
 		partial class Urls
 		{
 			public static readonly Uri Corretto = new Uri ($"{Corretto_BaseUri}{CorrettoUrlPathVersion}/amazon-corretto-{CorrettoDistVersion}-macosx-x64.tar.gz");

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs

@@ -5,6 +5,8 @@ namespace Xamarin.Android.Prepare
 {
 	partial class Configurables
 	{
+		const string JetBrainsOpenJDKOperatingSystem = "windows-x64";
+
 		partial class Urls
 		{
 			public static Uri Corretto => GetWindowsCorrettoUrl ();

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

@@ -15,13 +15,22 @@ namespace Xamarin.Android.Prepare
 	//
 	partial class Configurables
 	{
+		const string JetBrainsOpenJDKVersion = "11.0.4";
+		const string JetBrainsOpenJDKRelease = "546.1";
+		static readonly string JetBrainsOpenJDKDownloadVersion = JetBrainsOpenJDKVersion.Replace ('.', '_');
+
 		const string CorrettoDistVersion = "8.242.08.1";
 		const string CorrettoUrlPathVersion = CorrettoDistVersion;
 
 		static Context ctx => Context.Instance;
 
 		public static partial class Urls
 		{
+			// https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_4-linux-x64-b546.1.tar.gz
+			// https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_4-osx-x64-b546.1.tar.gz
+			// https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_4-windows-x64-b546.1.tar.gz
+			public static readonly Uri JetBrainsOpenJDK = new Uri ($"https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-{JetBrainsOpenJDKDownloadVersion}-{JetBrainsOpenJDKOperatingSystem}-b{JetBrainsOpenJDKRelease}.tar.gz");
+
 			// Keep the trailing slash here - OS-specific code assumes it's there.
 			public const string Corretto_BaseUri = "https://corretto.aws/downloads/resources/";
 
@@ -39,6 +48,9 @@ public static partial class Defaults
 		{
 			public static readonly char[] PropertyListSeparator            = new [] { ':' };
 
+			public static readonly Version JetBrainsOpenJDKVersion = new Version (Configurables.JetBrainsOpenJDKVersion);
+			public static readonly Version JetBrainsOpenJDKRelease = new Version (Configurables.JetBrainsOpenJDKRelease);
+
 			// Mono runtimes
 			public const string DebugFileExtension                         = ".pdb";
 			public const string MonoHostMingwRuntimeNativeLibraryExtension = WindowsDLLSuffix;
@@ -104,9 +116,9 @@ public static partial class Defaults
 			public const int DefaultMaximumParallelTasks = 5;
 
 			/// <summary>
-			///   The maximum JDK version we support. Note: this will probably go away with Corretto
+			///   The maximum JDK version we support.
 			/// </summary>
-			public const int MaxJDKVersion = 8;
+			public static readonly Version MaxJDKVersion = new Version (11, 99, 0);
 
 			/// <summary>
 			///   Prefix for all the log files created by the bootstrapper.
@@ -318,6 +330,10 @@ public static partial class Paths
 			public static string CorrettoCacheDir                    => GetCachedPath (ref correttoCacheDir, ()                    => ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainCacheDirectory));
 			public static string CorrettoInstallDir                  => GetCachedPath (ref correttoInstallDir, ()                  => Path.Combine (ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainDirectory), "jdk"));
 
+			// JetBrains OpenJDK
+			public static string OpenJDKInstallDir                   => GetCachedPath (ref openJDKInstallDir, ()                   => Path.Combine (ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainDirectory), "jdk"));
+			public static string OpenJDKCacheDir                     => GetCachedPath (ref openJDKCacheDir, ()                     => ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainCacheDirectory));
+
 			// bundle
 			public static string BCLTestsArchiveName                 = "bcl-tests.zip";
 
@@ -403,6 +419,8 @@ static string GetCachedPath (ref string variable, Func<string> creator)
 			static string monoSdksTpnExternalPath;
 			static string monoSDKSIncludeDestDir;
 			static string monoLlvmTpnPath;
+			static string openJDKInstallDir;
+			static string openJDKCacheDir;
 		}
 	}
 }

build-tools/xaprepare/xaprepare/Scenarios/Scenario_AndroidToolchain.cs

@@ -6,12 +6,12 @@ namespace Xamarin.Android.Prepare
 	partial class Scenario_AndroidToolchain : ScenarioNoStandardEndSteps
 	{
 		public Scenario_AndroidToolchain () 
-			: base ("AndroidToolchain", "Install Android SDK, NDK and Corretto JDK.", Context.Instance)
+			: base ("AndroidToolchain", "Install Android SDK, NDK and OpenJDK.", Context.Instance)
 		{}
 
 		protected override void AddSteps (Context context)
 		{
-			Steps.Add (new Step_InstallCorrettoOpenJDK ());
+			Steps.Add (new Step_InstallJetBrainsOpenJDK ());
 			Steps.Add (new Step_Android_SDK_NDK ());
 
 			// disable installation of missing programs...

build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs

@@ -19,7 +19,7 @@ protected override void AddSteps (Context context)
 				throw new ArgumentNullException (nameof (context));
 
 			Steps.Add (new Step_ShowEnabledRuntimes ());
-			Steps.Add (new Step_InstallCorrettoOpenJDK ());
+			Steps.Add (new Step_InstallJetBrainsOpenJDK ());
 			Steps.Add (new Step_Android_SDK_NDK ());
 			Steps.Add (new Step_GenerateFiles (atBuildStart: true));
 			Steps.Add (new Step_PrepareProps ());

build-tools/xaprepare/xaprepare/Steps/Step_InstallJetBrainsOpenJDK.Linux.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Xamarin.Android.Prepare
+{
+	partial class Step_InstallJetBrainsOpenJDK
+	{
+		void MoveContents (string sourceDir, string destinationDir)
+		{
+			Utilities.MoveDirectoryContentsRecursively (sourceDir, destinationDir);
+		}
+	}
+}

build-tools/xaprepare/xaprepare/Steps/Step_InstallJetBrainsOpenJDK.MacOS.cs

@@ -0,0 +1,14 @@
+using System;
+using System.IO;
+
+namespace Xamarin.Android.Prepare
+{
+	partial class Step_InstallJetBrainsOpenJDK
+	{
+		void MoveContents (string sourceDir, string destinationDir)
+		{
+			string realSourceDir = Path.Combine (sourceDir, "Contents", "Home");
+			Utilities.MoveDirectoryContentsRecursively (realSourceDir, destinationDir);
+		}
+	}
+}

build-tools/xaprepare/xaprepare/Steps/Step_InstallJetBrainsOpenJDK.Unix.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Xamarin.Android.Prepare
+{
+	partial class Step_InstallJetBrainsOpenJDK
+	{
+		async Task<bool> Unpack (string fullArchivePath, string destinationDirectory, bool cleanDestinationBeforeUnpacking = false)
+		{
+			return await Utilities.Unpack (fullArchivePath, destinationDirectory, cleanDestinatioBeforeUnpacking: true);
+		}
+	}
+}

build-tools/xaprepare/xaprepare/Steps/Step_InstallJetBrainsOpenJDK.Windows.cs

@@ -0,0 +1,43 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Xamarin.Android.Prepare
+{
+	partial class Step_InstallJetBrainsOpenJDK
+	{
+		async Task<bool> Unpack (string fullArchivePath, string destinationDirectory, bool cleanDestinationBeforeUnpacking = false)
+		{
+			// On Windows we don't have Tar available and the Windows package is a .tar.gz
+			// 7zip can unpack tar.gz but it's a two-stage process - first it decompresses the package, then it can be
+			// invoked again to extract the actual tar contents.
+
+			if (cleanDestinationBeforeUnpacking)
+				Utilities.DeleteDirectorySilent (destinationDirectory);
+			Utilities.CreateDirectory (destinationDirectory);
+
+			var sevenZip = new SevenZipRunner (Context.Instance);
+			Log.DebugLine ($"Uncompressing {fullArchivePath} to {destinationDirectory}");
+			if (!await sevenZip.Extract (fullArchivePath, destinationDirectory)) {
+				Log.DebugLine ($"Failed to decompress {fullArchivePath}");
+				return false;
+			}
+
+			string tarPath = Path.Combine (destinationDirectory, Path.GetFileNameWithoutExtension (fullArchivePath));
+			bool ret = await sevenZip.Extract (tarPath, destinationDirectory);
+			Utilities.DeleteFileSilent (tarPath);
+
+			if (!ret) {
+				Log.DebugLine ($"Failed to extract TAR contents from {tarPath}");
+				return false;
+			}
+
+			return true;
+		}
+
+		void MoveContents (string sourceDir, string destinationDir)
+		{
+			Utilities.MoveDirectoryContentsRecursively (sourceDir, destinationDir);
+		}
+	}
+}