Skip to content

Commit 43d2b83

Browse files
jpobstjpobst
committed
API-35 DP2
1 parent 396b0fe commit 43d2b83

File tree

17 files changed

+130414
-740
lines changed

17 files changed

+130414
-740
lines changed

‎Configuration.props‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,21 @@
2525
<!-- The min API level supported by Microsoft.Android.Sdk -->
2626
<AndroidMinimumDotNetApiLevel Condition="'$(AndroidMinimumDotNetApiLevel)' == ''">21</AndroidMinimumDotNetApiLevel>
2727
<!-- *Latest* *stable* API level binding that we support; used when building src/Xamarin.Android.Build.Tasks -->
28-
<AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">35</AndroidLatestStableApiLevel>
29-
<AndroidLatestStablePlatformId Condition="'$(AndroidLatestStablePlatformId)' == ''">VanillaIceCream</AndroidLatestStablePlatformId>
30-
<AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v15.0</AndroidLatestStableFrameworkVersion>
28+
<AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">34</AndroidLatestStableApiLevel>
29+
<AndroidLatestStablePlatformId Condition="'$(AndroidLatestStablePlatformId)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestStablePlatformId>
30+
<AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v14.0</AndroidLatestStableFrameworkVersion>
3131
<!-- *Latest* *unstable* API level binding that we support; this can be the same as *stable* -->
32-
<AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestUnstableApiLevel>
33-
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestUnstablePlatformId>
34-
<AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">$(AndroidLatestStableFrameworkVersion)</AndroidLatestUnstableFrameworkVersion>
32+
<AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">35</AndroidLatestUnstableApiLevel>
33+
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">VanillaIceCream</AndroidLatestUnstablePlatformId>
34+
<AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v14.0.99</AndroidLatestUnstableFrameworkVersion>
3535
<!-- The default API level used for $(TargetPlatformVersion) -->
3636
<AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidDefaultTargetDotnetApiLevel>
37-
<AndroidDefaultTargetDotnetPlatformId Condition=" '$(AndroidDefaultTargetDotnetPlatformId)' == '' ">$(AndroidLatestStablePlatformId)</AndroidDefaultTargetDotnetPlatformId>
3837
<!-- The API level and TargetFrameworkVersion for the default Mono.Android.dll build -->
3938
<AndroidApiLevel Condition=" '$(AndroidApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidApiLevel>
4039
<AndroidPlatformId Condition=" '$(AndroidPlatformId)' == '' ">$(AndroidLatestStablePlatformId)</AndroidPlatformId>
4140
<AndroidFrameworkVersion Condition=" '$(AndroidFrameworkVersion)' == '' ">$(AndroidLatestStableFrameworkVersion)</AndroidFrameworkVersion>
4241
<AndroidUseLatestPlatformSdk Condition=" '$(AndroidFrameworkVersion)' == '' ">True</AndroidUseLatestPlatformSdk>
43-
<AndroidJavaRuntimeApiLevel Condition="'$(AndroidJavaRuntimeApiLevel)' == ''">$(AndroidLatestStablePlatformId)</AndroidJavaRuntimeApiLevel>
42+
<AndroidJavaRuntimeApiLevel Condition="'$(AndroidJavaRuntimeApiLevel)' == ''">$(AndroidLatestStableApiLevel)</AndroidJavaRuntimeApiLevel>
4443
<DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
4544
<Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
4645
<LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>

‎build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public sealed class CheckApiCompatibility : Task
3232
{ "v12.1", "v12.0" },
3333
{ "v13.0", "v12.1" },
3434
{ "v14.0", "v13.0" },
35-
{ "v15.0", "v14.0" },
35+
{ "v14.0.99", "v14.0" },
3636
};
3737

3838
static readonly string assemblyToValidate = "Mono.Android.dll";

‎build-tools/api-merge/merge-configuration.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
<File Path="api-32.xml.in" Level="32" />
2424
<File Path="api-33.xml.in" Level="33" />
2525
<File Path="api-34.xml.in" Level="34" />
26-
<File Path="api-35.xml.in" Level="35" />
26+
<File Path="api-VanillaIceCream.xml.in" Level="35" />
2727
</Inputs>
2828
<Outputs>
29-
<File Path="api-35.xml" LastLevel="35" />
29+
<File Path="api-VanillaIceCream.xml" LastLevel="35" />
3030
</Outputs>
3131
</Configuration>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ variables:
5151
- name: IsRelOrTargetingRel
5252
value: $[or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['System.PullRequest.TargetBranch'], 'release/'))]
5353
- name: DefaultTestSdkPlatforms # Comma-separated SDK Platform(s) to install on test agents (no spaces)
54-
value: VanillaIceCream
54+
value: 34,VanillaIceCream
5555
- name: ExcludedNightlyNUnitCategories
5656
value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
5757
- name: RunMAUITestJob

‎build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class BuildAndroidPlatforms
4545
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1"),
4646
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
4747
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "34", include: "v14.0", framework: "v14.0"),
48-
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "VanillaIceCream", include: "v15.0", framework: "v15.0"),
48+
new AndroidPlatform (apiName: "VanillaIceCream", apiLevel: 35, platformID: "VanillaIceCream", include: "v14.0.99", framework: "v14.0.99", stable: false),
4949
};
5050

5151
}

‎build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ public AndroidToolchain ()
7070
new AndroidPlatformComponent ("platform-31_r01", apiLevel: "31", pkgRevision: "1"),
7171
new AndroidPlatformComponent ("platform-32_r01", apiLevel: "32", pkgRevision: "1"),
7272
new AndroidPlatformComponent ("platform-33-ext3_r03", apiLevel: "33", pkgRevision: "3"),
73-
new AndroidPlatformComponent ("platform-34-ext7_r02", apiLevel: "34", pkgRevision: "2"),
74-
new AndroidPlatformComponent ("platform-VanillaIceCream_r01", apiLevel: "VanillaIceCream", pkgRevision: "1", isLatestStable: true),
73+
new AndroidPlatformComponent ("platform-34-ext7_r02", apiLevel: "34", pkgRevision: "2", isLatestStable: true),
74+
new AndroidPlatformComponent ("platform-VanillaIceCream_r02", apiLevel: "VanillaIceCream", pkgRevision: "2", isLatestStable: true),
7575

7676
new AndroidToolchainComponent ("sources-34_r01",
7777
destDir: Path.Combine ("sources", "android-34"),

‎src/Mono.Android/Java.Util/IList.cs‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
using System;
2+
using Android.Runtime;
3+
4+
namespace Java.Util;
5+
6+
#if ANDROID_35
7+
public partial interface IList
8+
{
9+
// This gets generated as:
10+
// return Android.Runtime.JavaList.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef)!;
11+
// instead of:
12+
// return global::Java.Lang.Object.GetObject<Java.Util.ISequencedCollection> (__rm.Handle, JniHandleOwnership.TransferLocalRef)!;
13+
private static Delegate? cb_reversed;
14+
15+
#pragma warning disable 0169
16+
[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")]
17+
private static Delegate GetReversedHandler ()
18+
{
19+
if (cb_reversed == null)
20+
cb_reversed = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Reversed));
21+
return cb_reversed;
22+
}
23+
24+
[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")]
25+
private static IntPtr n_Reversed (IntPtr jnienv, IntPtr native__this)
26+
{
27+
var __this = global::Java.Lang.Object.GetObject<Java.Util.IList> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
28+
return JNIEnv.ToLocalJniHandle (__this.Reversed ());
29+
}
30+
#pragma warning restore 0169
31+
32+
// Metadata.xml XPath method reference: path="/api/package[@name='java.util']/interface[@name='List']/method[@name='reversed' and count(parameter)=0]"
33+
[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")]
34+
[Register ("reversed", "()Ljava/util/List;", "GetReversedHandler:Java.Util.IList, Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", ApiSince = 35)]
35+
unsafe Java.Util.ISequencedCollection Java.Util.ISequencedCollection.Reversed ()
36+
{
37+
const string __id = "reversed.()Ljava/util/List;";
38+
try {
39+
var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null);
40+
return global::Java.Lang.Object.GetObject<Java.Util.ISequencedCollection> (__rm.Handle, JniHandleOwnership.TransferLocalRef)!;
41+
} finally {
42+
}
43+
}
44+
}
45+
#endif

‎src/Mono.Android/Java.Util/ISortedMap.cs‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
using System;
2+
using Android.Runtime;
3+
4+
namespace Java.Util;
5+
6+
#if ANDROID_35
7+
public partial interface ISortedMap
8+
{
9+
// This gets generated as:
10+
// return Android.Runtime.JavaDictionary.FromJniHandle (__rm.Handle, JniHandleOwnership.TransferLocalRef)!;
11+
// instead of:
12+
// return global::Java.Lang.Object.GetObject<Java.Util.ISequencedMap> (__rm.Handle, JniHandleOwnership.TransferLocalRef)!;
13+
private static Delegate? cb_reversed;
14+
15+
#pragma warning disable 0169
16+
[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")]
17+
private static Delegate GetReversedHandler ()
18+
{
19+
if (cb_reversed == null)
20+
cb_reversed = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Reversed));
21+
return cb_reversed;
22+
}
23+
24+
[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")]
25+
private static IntPtr n_Reversed (IntPtr jnienv, IntPtr native__this)
26+
{
27+
var __this = global::Java.Lang.Object.GetObject<Java.Util.ISortedMap> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
28+
return JNIEnv.ToLocalJniHandle (__this.Reversed ());
29+
}
30+
#pragma warning restore 0169
31+
32+
// Metadata.xml XPath method reference: path="/api/package[@name='java.util']/interface[@name='SortedMap']/method[@name='reversed' and count(parameter)=0]"
33+
[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android35.0")]
34+
[Register ("reversed", "()Ljava/util/SortedMap;", "GetReversedHandler:Java.Util.ISortedMap, Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", ApiSince = 35)]
35+
unsafe Java.Util.ISequencedMap Java.Util.ISequencedMap.Reversed ()
36+
{
37+
const string __id = "reversed.()Ljava/util/SortedMap;";
38+
try {
39+
var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null);
40+
return global::Java.Lang.Object.GetObject<Java.Util.ISequencedMap> (__rm.Handle, JniHandleOwnership.TransferLocalRef)!;
41+
} finally {
42+
}
43+
}
44+
}
45+
#endif

‎src/Mono.Android/Mono.Android.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@
9797
<Compile Include="Java.Time\ZonedDateTime.cs" />
9898
<Compile Include="Java.Time\LocalDateTime.cs" />
9999
<Compile Include="Java.Time\LocalDate.cs" />
100+
<Compile Include="Java.Util\ISortedMap.cs" />
101+
<Compile Include="Java.Util\IList.cs" />
100102
</ItemGroup>
101103

102104
<Import Project="..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems')" />

‎src/Mono.Android/Profiles/api-35.params.txt‎ renamed to ‎src/Mono.Android/Profiles/api-VanillaIceCream.params.txt‎

File renamed without changes.

0 commit comments

Comments
 (0)