Skip to content

Commit a126260

Browse files
committed
[Mono.Android] Bind Android 14 DP 1.
1 parent aa54ed3 commit a126260

File tree

15 files changed

+37521
-8
lines changed

15 files changed

+37521
-8
lines changed

Configuration.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<AndroidLatestStablePlatformId Condition="'$(AndroidLatestStablePlatformId)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestStablePlatformId>
3535
<AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v13.0</AndroidLatestStableFrameworkVersion>
3636
<!-- *Latest* *unstable* API level binding that we support; this can be the same as *stable* -->
37-
<AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">$(AndroidLatestStableApiLevel)</AndroidLatestUnstableApiLevel>
38-
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">Tiramisu</AndroidLatestUnstablePlatformId>
39-
<AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v13.0</AndroidLatestUnstableFrameworkVersion>
37+
<AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">34</AndroidLatestUnstableApiLevel>
38+
<AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">UpsideDownCake</AndroidLatestUnstablePlatformId>
39+
<AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v13.0.99</AndroidLatestUnstableFrameworkVersion>
4040
<!-- The default API level used for $(TargetPlatformVersion) -->
4141
<AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">33</AndroidDefaultTargetDotnetApiLevel>
4242
<!-- The API level and TargetFrameworkVersion for the default Mono.Android.dll build -->

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public sealed class CheckApiCompatibility : Task
3131
{ "v12.0", "v11.0" },
3232
{ "v12.1", "v12.0" },
3333
{ "v13.0", "v12.1" },
34+
{ "v13.0.99", "v13.0" },
3435
};
3536

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<File Path="api-31.xml.in" Level="31" />
2323
<File Path="api-32.xml.in" Level="32" />
2424
<File Path="api-33.xml.in" Level="33" />
25+
<File Path="api-UpsideDownCake.xml.in" Level="34" />
2526
</Inputs>
2627
<Outputs>
2728
<File Path="api-19.xml" LastLevel="19" />
@@ -39,5 +40,6 @@
3940
<File Path="api-31.xml" LastLevel="31" />
4041
<File Path="api-32.xml" LastLevel="32" />
4142
<File Path="api-33.xml" LastLevel="33" />
43+
<File Path="api-UpsideDownCake.xml" LastLevel="34" />
4244
</Outputs>
4345
</Configuration>

build-tools/api-xml-adjuster/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ API_XML_TOOL = $(BUILDBIN)/api-xml-adjuster.exe
1717
RUNTIME = mono --debug
1818
RUN_CLASS_PARSE = $(RUNTIME) $(CLASS_PARSE)
1919
RUN_API_XML_TOOL = $(RUNTIME) $(API_XML_TOOL)
20-
API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
20+
API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 UpsideDownCake
2121

2222
XML_OUTPUT_DIR = .
2323

build-tools/automation/yaml-templates/setup-test-environment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ steps:
6464

6565
- template: run-xaprepare.yaml
6666
parameters:
67-
arguments: --s=AndroidTestDependencies --android-sdk-platforms="19,21,26,32,33"
67+
arguments: --s=AndroidTestDependencies --android-sdk-platforms="19,21,26,32,33,UpsideDownCake"
6868
xaSourcePath: ${{ parameters.xaSourcePath }}
6969

7070
- task: DotNetCoreCLI@2

build-tools/installers/create-installers.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Target Name="_FindFrameworkDirs">
3939
<ItemGroup>
4040
<_FrameworkDirs Include="@(AndroidApiInfo->'$(FrameworkSrcDir)%(Identity)\')" />
41-
<_FrameworkDirsThatExist Condition="Exists('%(Identity)')" Include="@(_FrameworkDirs)" />
41+
<_FrameworkDirsThatExist Condition="Exists('%(Identity)')" Include="@(_FrameworkDirs)" Exclude="$(FrameworkSrcDir)v13.0.99\" />
4242
<_EarlierFrameworkDir Include="@(_FrameworkDirsThatExist)" Exclude="$(_LatestStableFrameworkDir)" />
4343
</ItemGroup>
4444
</Target>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class BuildAndroidPlatforms
4444
new AndroidPlatform (apiName: "S", apiLevel: 31, platformID: "31", include: "v12.0", framework: "v12.0"),
4545
new AndroidPlatform (apiName: "Sv2", apiLevel: 32, platformID: "32", include: "v12.1", framework: "v12.1"),
4646
new AndroidPlatform (apiName: "Tiramisu", apiLevel: 33, platformID: "33", include: "v13.0", framework: "v13.0"),
47+
new AndroidPlatform (apiName: "UpsideDownCake", apiLevel: 34, platformID: "UpsideDownCake", include: "v13.0.99",framework: "v13.0.99", stable: false),
4748
};
4849

4950
public static readonly Dictionary<string, uint> NdkMinimumAPIMap = new Dictionary<string, uint> {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public AndroidToolchain ()
7373
new AndroidPlatformComponent ("platform-31_r01", apiLevel: "31", pkgRevision: "1"),
7474
new AndroidPlatformComponent ("platform-32_r01", apiLevel: "32", pkgRevision: "1"),
7575
new AndroidPlatformComponent ("platform-33_r01", apiLevel: "33", pkgRevision: "1"),
76+
new AndroidPlatformComponent ("platform-UpsideDownCake_r01", apiLevel: "UpsideDownCake", pkgRevision: "1"),
7677

7778
new AndroidToolchainComponent ("sources-33_r01",
7879
destDir: Path.Combine ("sources", "android-33"),

src/Mono.Android.Runtime/Mono.Android.Runtime.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131

3232
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
3333

34-
<!-- Only build the .NET 6+ version of 'Mono.Android.Export.dll' for the latest stable Android version. -->
34+
<!-- Only build the .NET 6+ version of 'Mono.Android.Export.dll' for the latest stable Android version.
3535
<PropertyGroup Condition=" '$(AndroidApiLevel)' != '$(AndroidLatestStableApiLevel)' ">
3636
<BuildDependsOn></BuildDependsOn>
3737
</PropertyGroup>
38-
38+
-->
3939
<!-- Copy .NET ref/runtime assemblies to bin/$(Configuration)/dotnet/packs folder -->
4040
<PropertyGroup Condition=" '$(AndroidApiLevel)' == '$(AndroidLatestStableApiLevel)' ">
4141
<BuildDependsOn>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System;
2+
using Android.Runtime;
3+
4+
namespace Android.Graphics
5+
{ partial class PathIterator
6+
{
7+
8+
#if ANDROID_34
9+
// This implements an interface method that should be marked as 'default' but isn't.
10+
public void Remove ()
11+
{
12+
throw new Java.Lang.UnsupportedOperationException ();
13+
}
14+
#endif
15+
}
16+
}

0 commit comments

Comments
 (0)