Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit acf8584

Browse files
RedthRedth
committed
Bump to 25.3.1 sdk version and add new bindings
This fixes bindings so they compile with 25.3.1
1 parent 772e8cf commit acf8584

File tree

12 files changed

+319
-50
lines changed

12 files changed

+319
-50
lines changed

‎AndroidSupport.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exif", "exifinterface\sourc
5555
EndProject
5656
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Annotations", "support-annotations\source\Annotations.csproj", "{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}"
5757
EndProject
58+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicAnimation", "dynamic-animation\source\DynamicAnimation.csproj", "{157F6FC3-90D1-40D5-91D0-A2552034B41A}"
59+
EndProject
5860
Global
5961
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6062
Debug|Any CPU = Debug|Any CPU
@@ -169,5 +171,9 @@ Global
169171
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
170172
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
171173
{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}.Release|Any CPU.Build.0 = Release|Any CPU
174+
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
175+
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Debug|Any CPU.Build.0 = Debug|Any CPU
176+
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Release|Any CPU.ActiveCfg = Release|Any CPU
177+
{157F6FC3-90D1-40D5-91D0-A2552034B41A}.Release|Any CPU.Build.0 = Release|Any CPU
172178
EndGlobalSection
173179
EndGlobal

‎build.cake‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ LogSystemInfo ();
1515

1616
var TARGET = Argument ("t", Argument ("target", "Default"));
1717

18-
var NUGET_VERSION = "25.2.0";
19-
var COMPONENT_VERSION = "25.2.0.0";
20-
var AAR_VERSION = "25.2.0";
18+
var NUGET_VERSION = "25.3.1-beta1";
19+
var COMPONENT_VERSION = "25.3.1.0";
20+
var AAR_VERSION = "25.3.1";
2121

2222
// FROM: https://dl.google.com/android/repository/addon2-1.xml
23-
var M2_REPOSITORY_URL = "https://dl-ssl.google.com/android/repository/android_m2repository_r44.zip";
23+
var M2_REPOSITORY_URL = "https://dl-ssl.google.com/android/repository/android_m2repository_r47.zip";
2424
var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r25-macosx.zip";
2525
var ANDROID_SDK_VERSION = IsRunningOnWindows () ? "v7.0" : "android-24";
2626
var RENDERSCRIPT_FOLDER = "android-7.1.1";
@@ -52,6 +52,7 @@ var AAR_INFOS = new [] {
5252
new AarInfo ("support-compat", "support-compat", "Xamarin.Android.Support.Compat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
5353
new AarInfo ("support-core-utils", "support-core-utils", "Xamarin.Android.Support.Core.Utils", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
5454
new AarInfo ("support-core-ui", "support-core-ui", "Xamarin.Android.Support.Core.UI", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
55+
new AarInfo ("support-dynamic-animation", "dynamic-animation", "Xamarin.Android.Support.Dynamic.Animation", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
5556
new AarInfo ("support-media-compat", "support-media-compat", "Xamarin.Android.Support.Media.Compat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
5657
new AarInfo ("support-fragment", "support-fragment", "Xamarin.Android.Support.Fragment", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
5758
new AarInfo ("transition", "transition", "Xamarin.Android.Support.Transition", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
@@ -110,6 +111,7 @@ var buildSpec = new BuildSpec {
110111
OutputFiles = new [] {
111112
new OutputFileCopy { FromFile = "./customtabs/source/bin/Release/Xamarin.Android.Support.CustomTabs.dll" },
112113
new OutputFileCopy { FromFile = "./design/source/bin/Release/Xamarin.Android.Support.Design.dll" },
114+
new OutputFileCopy { FromFile = "./dynamic-animation/source/bin/Release/Xamarin.Android.Support.Dynamic.Animation.dll" },
113115
new OutputFileCopy { FromFile = "./percent/source/bin/Release/Xamarin.Android.Support.Percent.dll" },
114116
new OutputFileCopy { FromFile = "./recommendation/source/bin/Release/Xamarin.Android.Support.Recommendation.dll" },
115117
//new OutputFileCopy { FromFile = "./v4/source/bin/Release/Xamarin.Android.Support.v4.dll" },
@@ -163,6 +165,7 @@ var buildSpec = new BuildSpec {
163165
NuGets = new [] {
164166
new NuGetInfo { NuSpec = "./customtabs/nuget/Xamarin.Android.Support.CustomTabs.nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true },
165167
new NuGetInfo { NuSpec = "./design/nuget/Xamarin.Android.Support.Design.nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true },
168+
new NuGetInfo { NuSpec = "./dynamic-animation/nuget/Xamarin.Android.Support.Dynamic.Animation.nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true },
166169
new NuGetInfo { NuSpec = "./percent/nuget/Xamarin.Android.Support.Percent.nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true },
167170
new NuGetInfo { NuSpec = "./recommendation/nuget/Xamarin.Android.Support.Recommendation.nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true },
168171
new NuGetInfo { NuSpec = "./v4/nuget/Xamarin.Android.Support.v4.nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true },

‎dynamic-animation/nuget/Xamarin.Android.Support.Dynamic.Animation.nuspec‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0"?>
2+
<package>
3+
<metadata>
4+
<id>Xamarin.Android.Support.Dynamic.Animations</id>
5+
<title>Xamarin Android Support Library - Dynamic Animations</title>
6+
<version>$version$</version>
7+
<authors>Xamarin Inc.</authors>
8+
<owners>Xamarin Inc.</owners>
9+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
10+
<description>Dynamic Animations Android Support Library C# bindings for Xamarin</description>
11+
<copyright>Copyright © Microsoft Corporation</copyright>
12+
<projectUrl>https://github.com/xamarin/AndroidSupportComponents/</projectUrl>
13+
<licenseUrl>https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md</licenseUrl>
14+
<iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/dynamic-animations_128x128.png</iconUrl>
15+
<dependencies>
16+
<group targetFramework="MonoAndroid70">
17+
<dependency id="Xamarin.Build.Download" version="0.4.3" />
18+
</group>
19+
</dependencies>
20+
</metadata>
21+
<files>
22+
<file src="dynamic-animations/nuget/Xamarin.Android.Support.Dynamic.Animations.targets" target="build/MonoAndroid70" />
23+
24+
<file src="output/Xamarin.Android.Support.Dynamic.Animations.dll" target="lib/MonoAndroid70" />
25+
</files>
26+
</package>

‎dynamic-animation/source/DynamicAnimation.csproj‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.props" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{157F6FC3-90D1-40D5-91D0-A2552034B41A}</ProjectGuid>
8+
<ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
9+
<OutputType>Library</OutputType>
10+
<RootNamespace>Android.Support.Dynamic.Animation</RootNamespace>
11+
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
12+
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
13+
<AssemblyName>Xamarin.Android.Support.Dynamic.Animation</AssemblyName>
14+
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
15+
<!-- <SignAssembly>true</SignAssembly>
16+
<DelaySign>true</DelaySign>
17+
<AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
18+
<AndroidClassParser>class-parse</AndroidClassParser>
19+
<ProductVersion>8.0.30703</ProductVersion>
20+
<SchemaVersion>2.0</SchemaVersion>
21+
</PropertyGroup>
22+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
23+
<DebugSymbols>true</DebugSymbols>
24+
<DebugType>full</DebugType>
25+
<Optimize>false</Optimize>
26+
<OutputPath>bin\Debug</OutputPath>
27+
<DefineConstants>DEBUG;</DefineConstants>
28+
<ErrorReport>prompt</ErrorReport>
29+
<WarningLevel>4</WarningLevel>
30+
<AndroidLinkMode>None</AndroidLinkMode>
31+
<ConsolePause>false</ConsolePause>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
34+
<DebugType>full</DebugType>
35+
<Optimize>true</Optimize>
36+
<OutputPath>bin\Release</OutputPath>
37+
<ErrorReport>prompt</ErrorReport>
38+
<WarningLevel>4</WarningLevel>
39+
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
40+
<ConsolePause>false</ConsolePause>
41+
</PropertyGroup>
42+
<PropertyGroup>
43+
<!--Docs URL Can be found here: http://dl-ssl.google.com/android/repository/repository-8.xml -->
44+
<DroidDocPaths>..\..\externals\docs\reference</DroidDocPaths>
45+
</PropertyGroup>
46+
<ItemGroup>
47+
<Reference Include="System" />
48+
<Reference Include="System.Xml" />
49+
<Reference Include="System.Core" />
50+
<Reference Include="Mono.Android" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<Compile Include="Properties\AssemblyInfo.cs" />
54+
</ItemGroup>
55+
<ItemGroup>
56+
<TransformFile Include="Transforms\EnumFields.xml" />
57+
<TransformFile Include="Transforms\EnumMethods.xml" />
58+
<TransformFile Include="Transforms\Metadata.xml" />
59+
</ItemGroup>
60+
<ItemGroup>
61+
<Folder Include="Additions\" />
62+
</ItemGroup>
63+
<ItemGroup>
64+
<None Include="packages.config" />
65+
</ItemGroup>
66+
<ItemGroup>
67+
<InputJar Include="..\..\externals\dynamic-animation\classes.jar">
68+
<Link>Jars\dynamic-animation-aar.jar</Link>
69+
</InputJar>
70+
</ItemGroup>
71+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
72+
<Import Project="..\..\generated.targets" />
73+
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.3\build\Xamarin.Build.Download.targets')" />
74+
</Project>

‎dynamic-animation/source/Properties/AssemblyInfo.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using Android.App;
4+
using Java.Interop;
5+
6+
// Information about this assembly is defined by the following attributes.
7+
// Change them to the values specific to your project.
8+
9+
[assembly: AssemblyTitle("Xamarin.Android.Support.Dynamic.Animation")]
10+
[assembly: AssemblyDescription("")]
11+
[assembly: AssemblyConfiguration("")]
12+
[assembly: AssemblyCompany ("Microsoft Corporation")]
13+
[assembly: AssemblyProduct("")]
14+
[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
15+
[assembly: AssemblyTrademark("")]
16+
[assembly: AssemblyCulture("")]
17+
18+
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
19+
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
20+
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
21+
22+
[assembly: AssemblyVersion("1.0.0")]
23+
24+
// The following attributes are used to specify the signing key for the assembly,
25+
// if desired. See the Mono documentation for more information about signing.
26+
27+
//[assembly: AssemblyDelaySign(false)]
28+
//[assembly: AssemblyKeyFile("")]

‎dynamic-animation/source/Transforms/EnumFields.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<enum-field-mappings>
2+
<!-- <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType">
3+
<field jni-name="Fragment_id" clr-name="Id" value="1" />
4+
<field jni-name="Fragment_name" clr-name="Name" value="0" />
5+
<field jni-name="Fragment_tag" clr-name="Tag" value="2" />
6+
</mapping>-->
7+
</enum-field-mappings>

‎dynamic-animation/source/Transforms/EnumMethods.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<enum-method-mappings>
2+
3+
</enum-method-mappings>

‎dynamic-animation/source/Transforms/Metadata.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<metadata>
2+
3+
<attr path="/api/package[@name='android.support.annotations']" name="managedName">Android.Support.Annotations</attr>
4+
5+
</metadata>

‎dynamic-animation/source/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Xamarin.Build.Download" version="0.4.3" targetFramework="monoandroid70" />
4+
</packages>

‎util/maven-repo-dependency-diff.workbook‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
---
2+
uti: com.xamarin.workbook
3+
platforms:
4+
- Console
5+
packages:
6+
- id: MavenNet
7+
version: 1.0.5
8+
---
9+
10+
```csharp
11+
#r "MavenNet"
12+
using MavenNet;
13+
```
14+
15+
```csharp
16+
const string MAVEN_REPO = "../externals/m2repository/";
17+
const string OLD_VER = "25.1.1";
18+
const string NEW_VER = "25.3.1";
19+
```
20+
21+
```csharp
22+
var repo = MavenNet.MavenRepository.OpenDirectory (MAVEN_REPO);
23+
await repo.LoadMetadataAsync ();
24+
25+
foreach (var item in repo.Metadata) {
26+
27+
var oldProj = await repo.GetProjectAsync (item.GroupId, item.ArtifactId, OLD_VER);
28+
var newProj = await repo.GetProjectAsync (item.GroupId, item.ArtifactId, NEW_VER);
29+
30+
if (oldProj == null && newProj == null)
31+
continue;
32+
if (newProj == null) {
33+
Console.WriteLine (item.ArtifactId + " -> Removed");
34+
continue;
35+
}
36+
if (oldProj == null) {
37+
Console.WriteLine (item.ArtifactId + " -> Added");
38+
39+
foreach (var d in newProj.Dependencies)
40+
Console.WriteLine ($"-> Dependency: {d.ArtifactId}");
41+
42+
continue;
43+
}
44+
45+
var removedDeps = oldProj.Dependencies.Where (od => !newProj.Dependencies.Any (nd => nd.GroupId == od.GroupId && nd.ArtifactId == od.ArtifactId));
46+
var addedDeps = newProj.Dependencies.Where (od => !oldProj.Dependencies.Any (nd => nd.GroupId == od.GroupId && nd.ArtifactId == od.ArtifactId));
47+
48+
if (removedDeps.Any () || addedDeps.Any ())
49+
Console.WriteLine (item.ArtifactId + " dependencies changed!");
50+
51+
foreach (var rm in removedDeps)
52+
Console.WriteLine ($"-> Removed: {rm.ArtifactId}");
53+
54+
foreach (var ad in addedDeps)
55+
Console.WriteLine ($"-> Added: {ad.ArtifactId}");
56+
}
57+
```

0 commit comments

Comments
 (0)