[xabt] build with & allow android projects to use JDK 25

Configuration.props

@@ -137,11 +137,11 @@
     <XABinutilsVersion Condition="'$(XABinutilsVersion)' == ''">L_18.1.6-8.0.0-1</XABinutilsVersion>
     <XABinutilsHash Condition="'$(XABinutilsHash)' == ''">5394EA6C411DA3A08BF0E6A87E1DD1B98BD2562B896C0CACD18E29E2FD4C0660</XABinutilsHash>
     <!-- Microsoft OpenJDK: https://learn.microsoft.com/en-us/java/openjdk/download -->
-    <MicrosoftOpenJDKVersion Condition="'$(MicrosoftOpenJDKVersion)' == ''">21.0.8</MicrosoftOpenJDKVersion>
-    <MicrosoftOpenJDKFolder Condition="'$(MicrosoftOpenJDKFolder)' == ''">jdk-21</MicrosoftOpenJDKFolder>
-    <MicrosoftOpenJDKRootDirName Condition="'$(MicrosoftOpenJDKRootDirName)' == ''">jdk-21.0.8+9</MicrosoftOpenJDKRootDirName>
+    <MicrosoftOpenJDKVersion Condition="'$(MicrosoftOpenJDKVersion)' == ''">25.0.4.1</MicrosoftOpenJDKVersion>
+    <MicrosoftOpenJDKFolder Condition="'$(MicrosoftOpenJDKFolder)' == ''">jdk-25</MicrosoftOpenJDKFolder>
+    <MicrosoftOpenJDKRootDirName Condition="'$(MicrosoftOpenJDKRootDirName)' == ''">jdk-25.0.4.1+1</MicrosoftOpenJDKRootDirName>
     <JavaSdkVersion Condition=" '$(JavaSdkVersion)' == '' ">$(MicrosoftOpenJDKVersion)</JavaSdkVersion>
-    <MinimumSupportedJavaSdkVersion Condition=" '$(MinimumSupportedJavaSdkVersion)' == '' ">17.0</MinimumSupportedJavaSdkVersion>
+    <MinimumSupportedJavaSdkVersion Condition=" '$(MinimumSupportedJavaSdkVersion)' == '' ">21.0</MinimumSupportedJavaSdkVersion>
     <JavaSdkDirectory Condition=" '$(JavaSdkDirectory)' == '' ">$(AndroidToolchainDirectory)\$(MicrosoftOpenJDKFolder)</JavaSdkDirectory>
     <_JdkExeExtension Condition=" '$(_JdkExeExtension)' == '' And '$(HostOS)' == 'Windows' ">.exe</_JdkExeExtension>
     <JavaPath Condition=" '$(JavaPath)' == '' ">$(JavaSdkDirectory)\bin\java$(_JdkExeExtension)</JavaPath>

build-tools/automation/azure-pipelines-internal.yaml

@@ -65,7 +65,7 @@ variables:
   value: 'false'
 # Override for internal pipeline
 - name: DefaultJavaSdkMajorVersion
-  value: 21
+  value: 25
 # Override pool images for internal (non-"-open") dnceng agents.
 # Confirm these pool/image names exist in the dnceng/internal project.
 # Match the public pipeline's Mac image (Apple Silicon). Using the x64

build-tools/automation/azure-pipelines-public.yaml

@@ -46,7 +46,7 @@ variables:
 - template: /build-tools/automation/yaml-templates/variables.yaml@self
 # Override for public pipeline
 - name: DefaultJavaSdkMajorVersion
-  value: 21
+  value: 25
 # Override pool images for public Microsoft-hosted agents
 - name: LinuxPoolImage
   value: ubuntu-22.04

build-tools/automation/yaml-templates/setup-jdk-variables.yaml

@@ -1,5 +1,5 @@
 parameters:
-  jdkMajorVersion: $(DefaultJavaSdkMajorVersion)   # Generally 11|17|21
+  jdkMajorVersion: $(DefaultJavaSdkMajorVersion)   # Supported: 21|25
   useAgentJdkPath: true                            # true to use preinstalled agent JDK, false to use 'android-toolchain/jdk-NN'
 
 steps:

build-tools/automation/yaml-templates/variables.yaml

@@ -61,9 +61,9 @@ variables:
 - name: DefaultTestSdkPlatforms  # Comma-separated SDK Platform(s) to install on test agents (no spaces)
   value: 35,36,36.1,37.0,37.1
 - name: DefaultJavaSdkMajorVersion
-  value: 17
-- name: LatestJavaSdkMajorVersion
   value: 21
+- name: LatestJavaSdkMajorVersion
+  value: 25
 - name: ExcludedNightlyNUnitCategories
   value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
 - name: RunMAUITestJob

eng/gradle/mirror-dependencies.ps1

@@ -65,8 +65,7 @@
 .EXAMPLE
     pwsh ./eng/gradle/mirror-dependencies.ps1 `
         -ProjectDir external/Java.Interop/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin-gradle `
-        -Task classes `
-        -GradleWrapper external/Java.Interop/build-tools/gradle/gradlew.bat
+        -Task classes
 
 .EXAMPLE
     pwsh ./eng/gradle/mirror-dependencies.ps1 `

external/Java.Interop/Directory.Build.props

@@ -58,7 +58,7 @@
   <PropertyGroup>
     <DotnetToolPath Condition=" '$(DotnetToolPath)' == '' ">dotnet</DotnetToolPath>
     <CmakePath Condition=" '$(CmakePath)' == '' ">cmake</CmakePath>
-    <GradleHome Condition=" '$(GradleHome)' == '' ">$(MSBuildThisFileDirectory)build-tools\gradle</GradleHome>
+    <GradleHome Condition=" '$(GradleHome)' == '' ">$(MSBuildThisFileDirectory)..\..\build-tools\gradle</GradleHome>
     <GradleWPath Condition=" '$(GradleWPath)' == '' ">$(GradleHome)\gradlew</GradleWPath>
     <GradleArgs Condition=" '$(GradleArgs)' == '' ">--stacktrace --no-daemon</GradleArgs>
     <JavacSourceVersion Condition=" '$(JavacSourceVersion)' == '' ">11</JavacSourceVersion>

external/Java.Interop/tools/java-source-utils/build.gradle

@@ -33,7 +33,7 @@ dependencies {
 
 application {
     // Define the main class for the application.
-    mainClassName = 'com.microsoft.android.App'
+    mainClass = 'com.microsoft.android.App'
 }
 
 jar {

src/Xamarin.Android.Build.Tasks/Tasks/AndroidApkSigner.cs

@@ -73,6 +73,11 @@ protected override string GenerateCommandLineCommands ()
 		{
 			var cmd = new CommandLineBuilder ();
 
+			var javaOptions = GetJavaOptions (JavaOptions, JdkVersion);
+			if (!javaOptions.IsNullOrEmpty ()) {
+				cmd.AppendSwitch (javaOptions);
+			}
+
 			var manifest = AndroidAppManifest.Load (ManifestFile.ItemSpec, MonoAndroidHelper.SupportedVersions);
 			int? minSdk = MonoAndroidHelper.SupportedVersions.MinStableVersion?.ApiLevel;
 			int? maxSdk = MonoAndroidHelper.SupportedVersions.MaxStableVersion?.ApiLevel;

src/Xamarin.Android.Build.Tasks/Tasks/BundleTool.cs

@@ -19,8 +19,9 @@ internal virtual CommandLineBuilder GetCommandLineBuilder ()
 		{
 			var cmd = new CommandLineBuilder ();
 
-			if (!JavaOptions.IsNullOrEmpty ()) {
-				cmd.AppendSwitch (JavaOptions);
+			var javaOptions = GetJavaOptions (JavaOptions, JdkVersion);
+			if (!javaOptions.IsNullOrEmpty ()) {
+				cmd.AppendSwitch (javaOptions);
 			}
 			cmd.AppendSwitchIfNotNull ("-Xmx", JavaMaximumHeapSize);
 			cmd.AppendSwitchIfNotNull ("-jar ", JarPath);