Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[build] Add support for JDK 21 #1287

Merged
merged 1 commit into from
Jan 8, 2025
Merged

[build] Add support for JDK 21 #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-tools/gradle/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 10 additions & 0 deletions src/Java.Base/Java.Lang/StringBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,15 @@

namespace Java.Lang {
partial class StringBuffer : IEnumerable, IEnumerable<char> {

#if JAVA_API_21
IAppendable? IAppendable.Append (char c) =>
Append (c);
IAppendable? IAppendable.Append (ICharSequence? s) =>
Append (s);
IAppendable? IAppendable.Append (ICharSequence? s, int a, int b) =>
Append (s, a, b);
#endif // JAVA_API_21

}
}
10 changes: 10 additions & 0 deletions src/Java.Base/Java.Lang/StringBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,15 @@

namespace Java.Lang {
partial class StringBuilder : IEnumerable, IEnumerable<char> {

#if JAVA_API_21
IAppendable? IAppendable.Append (char c) =>
Append (c);
IAppendable? IAppendable.Append (ICharSequence? s) =>
Append (s);
IAppendable? IAppendable.Append (ICharSequence? s, int a, int b) =>
Append (s, a, b);
#endif // JAVA_API_21

}
}
30 changes: 30 additions & 0 deletions src/Java.Base/Java.Lang/Thread.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
namespace Java.Lang {
partial class Thread {

#if JAVA_API_21
partial interface IBuilder {
partial class IOfPlatformInvoker {
IBuilder? IBuilder.InheritInheritableThreadLocals (bool value) =>
InheritInheritableThreadLocals (value);
IBuilder? IBuilder.Name (string? name) =>
Name (name);
IBuilder? IBuilder.Name (string? name, long v) =>
Name (name, v);
IBuilder? IBuilder.UncaughtExceptionHandler (IUncaughtExceptionHandler? u) =>
UncaughtExceptionHandler (u);
}
partial class IOfVirtualInvoker {
IBuilder? IBuilder.InheritInheritableThreadLocals (bool value) =>
InheritInheritableThreadLocals (value);
IBuilder? IBuilder.Name (string? name) =>
Name (name);
IBuilder? IBuilder.Name (string? name, long v) =>
Name (name, v);
IBuilder? IBuilder.UncaughtExceptionHandler (IUncaughtExceptionHandler? u) =>
UncaughtExceptionHandler (u);
}
}
#endif // JAVA_API_21

}
}
10 changes: 6 additions & 4 deletions src/Xamarin.Android.Tools.Bytecode/Methods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,16 @@ void UpdateParametersFromMethodParametersAttribute (ParameterInfo[] parameters)
MethodParameterAccessFlags.Final | MethodParameterAccessFlags.Synthetic;
var pinfo = methodParams.ParameterInfo;
int startIndex = 0;
while (startIndex < pinfo.Count &&
((pinfo [startIndex].AccessFlags & OuterThis1) == OuterThis1 ||
(pinfo [startIndex].AccessFlags & OuterThis2) == OuterThis2)) {
while (IsConstructor &&
startIndex < pinfo.Count &&
((pinfo [startIndex].AccessFlags & OuterThis1) == OuterThis1 ||
(pinfo [startIndex].AccessFlags & OuterThis2) == OuterThis2)) {
startIndex++;
}
Debug.Assert (
parameters.Length == pinfo.Count - startIndex,
$"Unexpected number of method parameters in `{DeclaringType.FullJniName}.{Name}{Descriptor}`: expected {parameters.Length}, got {pinfo.Count - startIndex}");
$"Unexpected number of method parameters in `{DeclaringType.FullJniName}.{Name}{Descriptor}`: expected {parameters.Length}, got {pinfo.Count - startIndex}! " +
$"pinfo.Count={pinfo.Count}, startIndex={startIndex}, pinfo={string.Join (", ", pinfo.Select (p => p.ToString ()))}");
int end = Math.Min (parameters.Length, pinfo.Count - startIndex);
for (int i = 0; i < end; ++i) {
var p = pinfo [i + startIndex];
Expand Down