Skip to content

Commit

Permalink
Refactored Bindings projects.
Browse files Browse the repository at this point in the history
- U: Remove binding library with support dependencies.
- U: Rename the AndroidX project with a simple naming convention.
- U: Update ApiDenition
- U: Update sample projects.
  • Loading branch information
JosueDistillery committed Aug 10, 2022
1 parent a85d6b9 commit 1b96de2
Show file tree
Hide file tree
Showing 234 changed files with 9,044 additions and 28,915 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6CDB5AD6-8892-4ED1-BFE4-C1B6CA8D28BA}</ProjectGuid>
<ProjectGuid>{4C9DC45A-6999-42AC-8F0B-2B54B98BF848}</ProjectGuid>
<ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<TemplateGuid>{77efb91c-a7e9-4b0e-a7c5-31eeec3c6d46}</TemplateGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Google.Maps.Utils.AndroidX</RootNamespace>
<AssemblyName>Google.Maps.Utils.AndroidX</AssemblyName>
<RootNamespace>Google.Maps.Utils.Android</RootNamespace>
<AssemblyName>Google.Maps.Utils.Android</AssemblyName>
<FileAlignment>512</FileAlignment>
<Deterministic>True</Deterministic>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<AndroidClassParser>class-parse</AndroidClassParser>
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
Expand All @@ -27,6 +27,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0618,0114</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType></DebugType>
Expand All @@ -35,6 +36,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0618,0114</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
Expand All @@ -54,60 +56,19 @@
<Folder Include="Jars\" />
</ItemGroup>
<ItemGroup>
<LibraryProjectZip Include="Jars\android-maps-utils-0.5.aar" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NuGet.Build.Packaging">
<Version>0.2.2</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Migration">
<Version>1.0.6.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.AppCompat">
<Version>1.1.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.CardView">
<Version>1.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Media">
<Version>1.1.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Browser">
<Version>1.2.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.MediaRouter">
<Version>1.1.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Google.Android.Material">
<Version>1.0.0.1</Version>
<Version>1.1.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.GooglePlayServices.Basement">
<Version>117.2.1-preview02</Version>
<PackageReference Include="Xamarin.AndroidX.Collection">
<Version>1.1.0.10</Version>
</PackageReference>
<PackageReference Include="Xamarin.GooglePlayServices.Maps">
<Version>117.0.0-preview04</Version>
</PackageReference>
<PackageReference Include="Xamarin.GooglePlayServices.Base">
<Version>117.2.1-preview02</Version>
</PackageReference>
<PackageReference Include="Xamarin.GooglePlayServices.Tasks">
<Version>117.0.2-preview02</Version>
</PackageReference>
<PackageReference Include="Xamarin.Build.Download">
<Version>0.10.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Fragment">
<Version>1.2.4.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4">
<Version>1.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
<Version>117.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<LibraryProjectZip Include="Jars\android-maps-utils-0.6.0.aar" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Binary file not shown.
31 changes: 31 additions & 0 deletions Bindings/Google.Maps.Utils.Android/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using System.Reflection;
using System.Runtime.InteropServices;
using Android;

// This attribute allows you to mark your assemblies as “safe to link”.
// When the attribute is present, the linker—if enabled—will process the assembly
// even if you’re using the “Link SDK assemblies only” option, which is the default for device builds.

[assembly: LinkerSafe]

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Google.Maps.Utils.Android")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Josue Diaz")]
[assembly: AssemblyProduct("Google.Maps.Utils.Android")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<enum-field-mappings>
<!--
<!--
This example converts the constants Fragment_id, Fragment_name,
and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
to an enum called Android.Support.V4.App.FragmentTagType with values
Expand All @@ -12,4 +12,4 @@
<field jni-name="Fragment_tag" clr-name="Tag" value="2" />
</mapping>
-->
</enum-field-mappings>
</enum-field-mappings>
Original file line number Diff line number Diff line change
@@ -1,38 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<enum-method-mappings>
<!--
This example changes the Java method:
android.support.v4.app.Fragment.SavedState.writeToParcel (int flags) to be:
android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags) when bound in C#.
<mapping jni-class="android/support/v4/app/Fragment.SavedState">
<method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
<!-- Error CS0738: 'Point' does not implement interface member 'IGeometry.GeometryObject'. 'Point.GeometryObject' cannot implement 'IGeometry.GeometryObject' because it does not have the matching return type of 'Object'. -->
<mapping jni-class="com/google/maps/android/data/Point">
<method jni-name="getGeometryObject" parameter="return" clr-enum-type="Java.Lang.Object"/>
</mapping>
<!-- Error CS0738: 'LineString' does not implement interface member 'IGeometry.GeometryObject'. 'LineString.GeometryObject' cannot implement 'IGeometry.GeometryObject' because it does not have the matching return type of 'Object'. -->
<mapping jni-class="com/google/maps/android/data/LineString">
<method jni-name="getGeometryObject" parameter="return" clr-enum-type="Java.Lang.Object"/>
</mapping>
Notes:
- For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
- To change the type of the return value, use "return" as the parameter name.
- The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
-->

<!-- Error CS0738: 'KmlPolygon' does not implement interface member 'IGeometry.GeometryObject'. 'KmlPolygon.GeometryObject' cannot implement 'IGeometry.GeometryObject' because it does not have the matching return type of 'Object'. -->
<mapping jni-class="com/google/maps/android/data/kml/KmlPolygon">
<method jni-name="getGeometryObject" parameter="return" clr-enum-type="Java.Lang.Object"/>
</mapping>
<!-- Error CS0738: 'MultiGeometry' does not implement interface member 'IGeometry.GeometryObject'. 'MultiGeometry.GeometryObject' cannot implement 'IGeometry.GeometryObject' because it does not have the matching return type of 'Object'. -->
<mapping jni-class="com/google/maps/android/data/MultiGeometry">
<method jni-name="getGeometryObject" parameter="return" clr-enum-type="Java.Lang.Object"/>
</mapping>
<!-- Error CS0738: 'Point' does not implement interface member 'IGeometry.GeometryObject'. 'Point.GeometryObject' cannot implement 'IGeometry.GeometryObject' because it does not have the matching return type of 'Object'. -->
<mapping jni-class="com/google/maps/android/data/Point">
<method jni-name="getGeometryObject" parameter="return" clr-enum-type="Java.Lang.Object"/>
</mapping>
</mapping>
<!-- Error CS0738: 'GeoJsonPolygon' does not implement interface member 'IGeometry.GeometryObject'. 'GeoJsonPolygon.GeometryObject' cannot implement 'IGeometry.GeometryObject' because it does not have the matching return type of 'Object'. -->
<mapping jni-class="com/google/maps/android/data/geojson/GeoJsonPolygon">
<method jni-name="getGeometryObject" parameter="return" clr-enum-type="Java.Lang.Object"/>
</mapping>
<!-- Error CS0738: 'LineString' does not implement interface member 'IGeometry.GeometryObject'. 'LineString.GeometryObject' cannot implement 'IGeometry.GeometryObject' because it does not have the matching return type of 'Object'. -->
<mapping jni-class="com/google/maps/android/data/LineString">
<method jni-name="getGeometryObject" parameter="return" clr-enum-type="Java.Lang.Object"/>
</mapping>
</enum-method-mappings>
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<attr path="/api/package[@name='com.google.maps.android.clustering.view']" name="managedName">Android.Gms.Maps.Utils.Clustering.View</attr>
<attr path="/api/package[@name='com.google.maps.android.clustering.algo']" name="managedName">Android.Gms.Maps.Utils.Clustering.Algorithm</attr>

<!-- Error CS0234: The type or namespace name 'IGeoJsonStyle' does not exist in the namespace 'Com.Google.Maps.Android.Data.Geojson' (are you missing an assembly reference?) (CS0234) -->
<attr path="/api/package[@name='com.google.maps.android.data.geojson']/interface[@name='GeoJsonStyle']" name="visibility">public</attr>

<!-- Error CS0507: 'KmlLayer.HasContainers': cannot change access modifiers when overriding 'protected' inherited member 'Layer.HasContainers' (CS0507) -->
<attr path="/api/package[@name='com.google.maps.android.data']/class[@name='Layer']/method[@name='hasContainers' and count(parameter)=0]" name="visibility">public</attr>
<attr path="/api/package[@name='com.google.maps.android.data']/class[@name='Layer']/method[@name='hasContainers' and count(parameter)=0]"
name="visibility">public</attr>
<!-- Error CS0507: 'KmlLayer.Containers': cannot change access modifiers when overriding 'protected' inherited member 'Layer.Containers' (CS0507) -->
<attr path="/api/package[@name='com.google.maps.android.data']/class[@name='Layer']/method[@name='getContainers' and count(parameter)=0]" name="visibility">public</attr>
<attr path="/api/package[@name='com.google.maps.android.data']/class[@name='Layer']/method[@name='getContainers' and count(parameter)=0]"
name="visibility">public</attr>
<!-- Error CS0507: 'KmlLayer.GroundOverlays': cannot change access modifiers when overriding 'protected' inherited member 'Layer.GroundOverlays' (CS0507) -->
<attr path="/api/package[@name='com.google.maps.android.data']/class[@name='Layer']/method[@name='getGroundOverlays' and count(parameter)=0]" name="visibility">public</attr>
<attr path="/api/package[@name='com.google.maps.android.data']/class[@name='Layer']/method[@name='getGroundOverlays' and count(parameter)=0]"
name="visibility">public</attr>
</metadata>
Loading

0 comments on commit 1b96de2

Please sign in to comment.