dotnet · jonpryor · Jun 2, 2023 · May 30, 2023
diff --git a/Configuration.Override.props.in b/Configuration.Override.props.in
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <JdkJvmPath>/Library/Java/JavaVirtualMachines/jdk1.8.0_77.jdk/Contents/Home/jre/jli/libjli.dylib</JdkJvmPath>
+    <JdkJvmPath>/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home/lib/jli/libjli.dylib</JdkJvmPath>
     <MonoFrameworkPath>/Library/Frameworks/Mono.framework/Libraries/libmonosgen-2.0.1.dylib</MonoFrameworkPath>
     <UtilityOutputFullPath>$(MSBuildThisFileDirectory)bin\$(Configuration)\</UtilityOutputFullPath>
   </PropertyGroup>
   <ItemGroup>
     <!-- JDK C `include` directories -->
-    <JdkIncludePath Include="/Library/Java/JavaVirtualMachines/jdk1.8.0_77.jdk/Contents/Home/include" />
-    <JdkIncludePath Include="/Library/Java/JavaVirtualMachines/jdk1.8.0_77.jdk/Contents/Home/include/darwin" />
+    <JdkIncludePath Include="/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home/include" />
+    <JdkIncludePath Include="/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home/include/darwin" />
   </ItemGroup>
   <ItemGroup>
     <!-- Mono C `include` directories -->

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -58,8 +58,8 @@
     <GradleHome Condition=" '$(GradleHome)' == '' ">$(MSBuildThisFileDirectory)build-tools\gradle</GradleHome>
     <GradleWPath Condition=" '$(GradleWPath)' == '' ">$(GradleHome)\gradlew</GradleWPath>
     <GradleArgs Condition=" '$(GradleArgs)' == '' ">--stacktrace --no-daemon</GradleArgs>
-    <JavacSourceVersion Condition=" '$(JavacSourceVersion)' == '' ">1.8</JavacSourceVersion>
-    <JavacTargetVersion Condition=" '$(JavacTargetVersion)' == '' ">1.8</JavacTargetVersion>
+    <JavacSourceVersion Condition=" '$(JavacSourceVersion)' == '' ">11</JavacSourceVersion>
+    <JavacTargetVersion Condition=" '$(JavacTargetVersion)' == '' ">11</JavacTargetVersion>
     <_BootClassPath Condition=" '$(JreRtJarPath)' != '' ">-bootclasspath "$(JreRtJarPath)"</_BootClassPath>
     <_JavacSourceOptions>-source $(JavacSourceVersion) -target $(JavacTargetVersion) $(_BootClassPath)</_JavacSourceOptions>
   </PropertyGroup>

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
@@ -20,7 +20,6 @@ pr:
 variables:
   RunningOnCI: true
   Build.Configuration: Release
-  MaxJdkVersion: 8
   DotNetCoreVersion: 7.x
   DotNetTargetFramework: net7.0
   NetCoreTargetFrameworkPathSuffix: -$(DotNetTargetFramework)

diff --git a/build-tools/automation/templates/core-build.yaml b/build-tools/automation/templates/core-build.yaml
@@ -6,7 +6,7 @@ steps:
   displayName: Prepare Solution
   inputs:
     projects: Java.Interop.sln
-    arguments: '-c $(Build.Configuration) -target:Prepare -p:MaxJdkVersion=$(MaxJdkVersion)'
+    arguments: '-c $(Build.Configuration) -target:Prepare'
 
 - task: DotNetCoreCLI@2
   displayName: Shut down existing build server

diff --git a/build-tools/gradle/gradle/wrapper/gradle-wrapper.properties b/build-tools/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/build-tools/scripts/Prepare.targets b/build-tools/scripts/Prepare.targets
@@ -15,26 +15,15 @@
     <PropertyGroup>
       <_MaxJdk>$(MaxJdkVersion)</_MaxJdk>
       <_MaxJdk Condition=" '$(_MaxJdk)' == '' ">$(JI_MAX_JDK)</_MaxJdk>
-      <Jdks8Root Condition=" '$(Jdks8Root)' == '' And '$(JAVA_HOME_8_X64)' != '' And Exists($(JAVA_HOME_8_X64)) ">$(JAVA_HOME_8_X64)</Jdks8Root>
+      <JdksRoot Condition=" '$(JdksRoot)' == '' And '$(JAVA_HOME_11_X64)' != '' And Exists($(JAVA_HOME_11_X64)) ">$(JAVA_HOME_11_X64)</JdksRoot>
     </PropertyGroup>
     <JdkInfo
-        JdksRoot="$(Jdks8Root)"
+        JdksRoot="$(JdksRoot)"
         MakeFragmentFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\JdkInfo.mk"
         MaximumJdkVersion="$(_MaxJdk)"
         DotnetToolPath="$(DotnetToolPath)"
         PropertyFile="$(_TopDir)\bin\Build$(Configuration)\JdkInfo.props">
       <Output TaskParameter="JavaHomePath" PropertyName="_JavaSdkDirectory" />
     </JdkInfo>
-    <PropertyGroup>
-      <Jdks11Root Condition=" '$(Jdks11Root)' == '' And '$(JAVA_HOME_11_X64)' != '' And Exists($(JAVA_HOME_11_X64)) ">$(JAVA_HOME_11_X64)</Jdks11Root>
-    </PropertyGroup>
-    <JdkInfo
-        JdksRoot="$(Jdks11Root)"
-        PropertyNameModifier="11"
-        MinimumJdkVersion="11.0"
-        MaximumJdkVersion="11.99.0"
-        PropertyFile="$(_TopDir)\bin\Build$(Configuration)\JdkInfo-11.props">
-      <Output TaskParameter="JavaHomePath" PropertyName="Java11SdkDirectory"/>
-    </JdkInfo>
   </Target>
 </Project>
diff --git a/src/Java.Base/Java.Base.targets b/src/Java.Base/Java.Base.targets
@@ -9,8 +9,8 @@
   </ItemGroup>
 
   <Target Name="_GetJavaBaseJmodPath">
-    <PropertyGroup Condition=" '$(Java11SdkDirectory)' != '' ">
-      <_JavaBaseJmod>$(Java11SdkDirectory)/jmods/java.base.jmod</_JavaBaseJmod>
+    <PropertyGroup Condition=" '$(JavaSdkDirectory)' != '' ">
+      <_JavaBaseJmod>$(JavaSdkDirectory)/jmods/java.base.jmod</_JavaBaseJmod>
     </PropertyGroup>
   </Target>
 

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/IJavaInterfaceTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/IJavaInterfaceTests.cs
@@ -16,7 +16,7 @@ public void ClassFile_WithIJavaInterface_class ()
 		{
 			var c   = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
 				ConstantPoolCount   = 23,
 				AccessFlags         = ClassAccessFlags.Interface | ClassAccessFlags.Abstract,

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaAnnotationTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaAnnotationTests.cs
@@ -16,7 +16,7 @@ public void ClassFile_WithJavaAnnotation_class ()
 		{
 			var c   = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
 				ConstantPoolCount   = 23,
 				AccessFlags         = ClassAccessFlags.Public | ClassAccessFlags.Interface | ClassAccessFlags.Abstract | ClassAccessFlags.Annotation,

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaEnumTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaEnumTests.cs
@@ -20,7 +20,7 @@ public void ClassFileDescription ()
 		{
 			var c   = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
 				ConstantPoolCount   = 53,
 				AccessFlags         = ClassAccessFlags.Final | ClassAccessFlags.Super | ClassAccessFlags.Enum,

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.1MyStringListTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.1MyStringListTests.cs
@@ -26,9 +26,9 @@ public void ClassFileDescription ()
 				: new ParameterInfo ("val$value1",        "Ljava/lang/Object;",   "Ljava/lang/Object;");
 			var c       = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
-				ConstantPoolCount   = 73,
+				ConstantPoolCount   = 74,
 				AccessFlags         = ClassAccessFlags.Super,
 				FullName            = "com/xamarin/JavaType$1MyStringList",
 				Superclass          = new TypeInfo ("java/util/ArrayList", "Ljava/util/ArrayList<Ljava/lang/String;>;"),

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.1Tests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.1Tests.cs
@@ -16,9 +16,9 @@ public void ClassFileDescription ()
 		{
 			var c   = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
-				ConstantPoolCount   = 47,
+				ConstantPoolCount   = 48,
 				AccessFlags         = ClassAccessFlags.Super,
 				FullName            = "com/xamarin/JavaType$1",
 				Superclass          = new TypeInfo ("java/lang/Object", "Ljava/lang/Object;"),

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.ASCTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.ASCTests.cs
@@ -16,9 +16,9 @@ public void ClassFileDescription ()
 		{
 			var c   = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
-				ConstantPoolCount   = 23,
+				ConstantPoolCount   = 24,
 				Deprecated          = true,
 				AccessFlags         = ClassAccessFlags.Super,
 				FullName            = "com/xamarin/JavaType$ASC",

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.PSCTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.PSCTests.cs
@@ -16,9 +16,9 @@ public void ClassFileDescription ()
 		{
 			var c   = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
-				ConstantPoolCount   = 20,
+				ConstantPoolCount   = 21,
 				AccessFlags         = ClassAccessFlags.Public | ClassAccessFlags.Super | ClassAccessFlags.Abstract,
 				FullName            = "com/xamarin/JavaType$PSC",
 				Superclass          = new TypeInfo ("java/lang/Object", "Ljava/lang/Object;"),

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.RNC.RPNCTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.RNC.RPNCTests.cs
@@ -16,9 +16,9 @@ public void ClassFileDescription ()
 		{
 			var c   = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
-				ConstantPoolCount   = 46,
+				ConstantPoolCount   = 47,
 				AccessFlags         = ClassAccessFlags.Public | ClassAccessFlags.Super | ClassAccessFlags.Abstract,
 				FullName            = "com/xamarin/JavaType$RNC$RPNC",
 				Superclass          = new TypeInfo ("java/lang/Object", "Ljava/lang/Object;"),

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.RNCTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.RNCTests.cs
@@ -16,9 +16,9 @@ public void ClassFileDescription ()
 		{
 			var c   = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
-				ConstantPoolCount   = 44,
+				ConstantPoolCount   = 45,
 				AccessFlags         = ClassAccessFlags.Public | ClassAccessFlags.Super | ClassAccessFlags.Abstract,
 				FullName            = "com/xamarin/JavaType$RNC",
 				Superclass          = new TypeInfo ("java/lang/Object", "Ljava/lang/Object;"),

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaTypeNoParametersTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaTypeNoParametersTests.cs
@@ -16,7 +16,7 @@ public void ClassFile_WithNonGenericGlobalType_class ()
 		{
 			var c   = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
 				ConstantPoolCount   = 18,
 				AccessFlags         = ClassAccessFlags.Public | ClassAccessFlags.Super,

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaTypeTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/JavaTypeTests.cs
@@ -18,9 +18,9 @@ public void ClassFile_WithJavaType_class ()
 		{
 			var c   = LoadClassFile ("JavaType.class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
-				ConstantPoolCount   = 198,
+				ConstantPoolCount   = 202,
 				AccessFlags         = ClassAccessFlags.Public | ClassAccessFlags.Super,
 				FullName            = "com/xamarin/JavaType",
 				Superclass          = new TypeInfo ("java/lang/Object", "Ljava/lang/Object;"),
@@ -65,6 +65,12 @@ public void ClassFile_WithJavaType_class ()
 						InnerName       = null,
 						AccessFlags     = 0,
 					},
+					new ExpectedInnerClassInfo {
+						InnerClassName  = "com/xamarin/JavaType$RNC$RPNC",
+						OuterClassName  = "com/xamarin/JavaType$RNC",
+						InnerName       = "RPNC",
+						AccessFlags     = ClassAccessFlags.Public | ClassAccessFlags.Abstract,
+					},
 				},
 				Fields = {
 					new ExpectedFieldDeclaration {
@@ -143,7 +149,7 @@ public void ClassFile_WithJavaType_class ()
 						Name                = "STATIC_FINAL_STRING",
 						Descriptor          = "Ljava/lang/String;",
 						AccessFlags         = FieldAccessFlags.Public | FieldAccessFlags.Static | FieldAccessFlags.Final,
-						ConstantValue       = "String(stringIndex=188 Utf8=\"Hello, \\\"embedded\0Nulls\" and \ud83d\udca9!\")",
+						ConstantValue       = "String(stringIndex=190 Utf8=\"Hello, \\\"embedded\0Nulls\" and \ud83d\udca9!\")",
 					},
 					new ExpectedFieldDeclaration {
 						Name                = "STATIC_FINAL_BOOL_FALSE",

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/NonGenericGlobalTypeTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/NonGenericGlobalTypeTests.cs
@@ -16,7 +16,7 @@ public void ClassFile_WithNonGenericGlobalType_class ()
 		{
 			var c   = LoadClassFile (JavaType + ".class");
 			new ExpectedTypeDeclaration {
-				MajorVersion        = 0x34,
+				MajorVersion        = 0x37,
 				MinorVersion        = 0,
 				ConstantPoolCount   = 16,
 				AccessFlags         = ClassAccessFlags.Super,

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/ParameterFixupTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/ParameterFixupTests.cs
@@ -24,7 +24,7 @@ public void XmlDeclaration_FixedUpFromDocumentation()
 				return;
 			}
 			try {
-				AssertXmlDeclaration ("Collection.class", "ParameterFixupFromDocs.xml", Path.Combine (Environment.GetEnvironmentVariable ("ANDROID_SDK_PATH"), "docs", "reference"));
+				AssertXmlDeclaration ("TypeEvaluator.class", "ParameterFixupFromDocs.xml", Path.Combine (Environment.GetEnvironmentVariable ("ANDROID_SDK_PATH"), "docs", "reference"));
 			} catch (Exception ex) {
 				Assert.Fail ("An unexpected exception was thrown : {0}", ex);
 			}
@@ -38,7 +38,7 @@ public void XmlDeclaration_FixedUpFromApiXmlDocumentation ()
 			try {
 				tempFile = LoadToTempFile ("ParameterFixupApiXmlDocs.xml");
 
-				AssertXmlDeclaration ("Collection.class", "ParameterFixupFromDocs.xml", tempFile);
+				AssertXmlDeclaration ("TypeEvaluator.class", "ParameterFixupFromDocs.xml", tempFile);
 			} finally {
 				if (File.Exists (tempFile))
 					File.Delete (tempFile);
@@ -111,7 +111,7 @@ public void XmlDeclaration_FixedUpFromParameterDescription ()
 			try {
 				tempFile = LoadToTempFile ("ParameterDescription.txt");
 
-				AssertXmlDeclaration (new string [] { "Collection.class" }, "ParameterFixupFromDocs.xml", tempFile);
+				AssertXmlDeclaration (new string [] { "TypeEvaluator.class" }, "ParameterFixupFromDocs.xml", tempFile);
 			}
 			finally {
 				if (File.Exists (tempFile))

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterDescription.txt b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterDescription.txt
@@ -1,9 +1,8 @@
 
 ; This is a comment line.
-package java.util ; Anything after semicolon is comment.
-  class Collection<E>
-    add(E e)
-    #ctor()
+package android.animation ; Anything after semicolon is comment.
+  class TypeEvaluator<T>
+    evaluate(float fraction, T startValue, T endValue)
 
 package com.xamarin
   interface NestedInterface.DnsSdTxtRecordListener

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixupApiXmlDocs.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixupApiXmlDocs.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <api>
-	<package name="java.util">
-		<class name="Collection">
-			<method name="add">
-				<parameter name="e" type="E" />
-			</method>
-		</class>
-	</package>
+  <package name="android.animation">
+    <class name="TypeEvaluator">
+      <method name="evaluate">
+        <parameter name="fraction"    type="float" />
+        <parameter name="startValue"  type="T" />
+        <parameter name="endValue"    type="T" />
+      </method>
+    </class>
+  </package>
 </api>
diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixupFromDocs.xml b/tests/Xamarin.Android.Tools.Bytecode-Tests/Resources/ParameterFixupFromDocs.xml
@@ -1,47 +1,51 @@
 <api
   api-source="class-parse">
   <package
-    name="java.util"
-    jni-name="java/util">
+    name="android.animation"
+    jni-name="android/animation">
     <interface
       abstract="true"
       deprecated="not deprecated"
       final="false"
-      name="Collection"
-      jni-signature="Ljava/util/Collection;"
-      source-file-name="Collection.java"
+      name="TypeEvaluator"
+      jni-signature="Landroid/animation/TypeEvaluator;"
+      source-file-name="TypeEvaluator.java"
       static="false"
       visibility="public">
       <typeParameters>
         <typeParameter
-          name="E"
+          name="T"
           jni-classBound="Ljava/lang/Object;"
           classBound="java.lang.Object"
           interfaceBounds=""
           jni-interfaceBounds="" />
       </typeParameters>
-      <implements
-        name="java.lang.Iterable"
-        name-generic-aware="java.lang.Iterable&lt;E&gt;"
-        jni-type="Ljava/lang/Iterable&lt;TE;&gt;;" />
       <method
         abstract="true"
         deprecated="not deprecated"
         final="false"
-        name="add"
+        name="evaluate"
         native="false"
-        return="boolean"
-        jni-return="Z"
+        return="T"
+        jni-return="TT;"
         static="false"
         synchronized="false"
         visibility="public"
         bridge="false"
         synthetic="false"
-        jni-signature="(Ljava/lang/Object;)Z">
+        jni-signature="(FLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;">
         <parameter
-          name="e"
-          type="E"
-          jni-type="TE;" />
+          name="fraction"
+          type="float"
+          jni-type="F" />
+        <parameter
+          name="startValue"
+          type="T"
+          jni-type="TT;" />
+        <parameter
+          name="endValue"
+          type="T"
+          jni-type="TT;" />
       </method>
     </interface>
   </package>

diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj b/tests/Xamarin.Android.Tools.Bytecode-Tests/Xamarin.Android.Tools.Bytecode-Tests.csproj
@@ -46,7 +46,7 @@
     <EmbeddedResource Include="$(IntermediateOutputPath)classes\com\xamarin\ParameterAbstractClass.class" />
     <EmbeddedResource Include="$(IntermediateOutputPath)classes\com\xamarin\ParameterClass.class" />
     <EmbeddedResource Include="$(IntermediateOutputPath)classes\com\xamarin\ParameterClass2.class" />
-    <EmbeddedResource Include="$(IntermediateOutputPath)classes\java\util\Collection.class" />
+    <EmbeddedResource Include="$(IntermediateOutputPath)classes\android\animation\TypeEvaluator.class" />
     <EmbeddedResource Include="$(IntermediateOutputPath)classes\module-info.class" />
     <EmbeddedResource Include="$(IntermediateOutputPath)classes\NonGenericGlobalType.class" />
   </ItemGroup>