Fix support for offline storage

NAXAM · Nov 16, 2017 · fd0ddf1 · fd0ddf1
1 parent 3148ac8
commit fd0ddf1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/Naxam.Mapbox.iOS.3.6.0.nupkg → Naxam.Mapbox.iOS.3.6.0.3.nupkg b/Naxam.Mapbox.iOS.3.6.0.nupkg → Naxam.Mapbox.iOS.3.6.0.3.nupkg
diff --git a/Naxam.Mapbox.iOS/ApiDefinitions.cs b/Naxam.Mapbox.iOS/ApiDefinitions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using CoreAnimation;
 using CoreGraphics;
 using CoreLocation;
@@ -1758,7 +1758,7 @@ interface MGLMapViewDelegate
 
 	// @protocol MGLOfflineRegion <NSObject>
 	[Protocol, Model]
-	[BaseType(typeof(NSObject))]
+    [BaseType(typeof(NSObject), Name = "MGLOfflineRegion")]
 	interface MGLOfflineRegion
 	{
 	}
@@ -1769,7 +1769,7 @@ interface MGLOfflinePack
 	{
 		// @property (readonly, nonatomic) id<MGLOfflineRegion> _Nonnull region;
 		[Export("region")]
-		MGLOfflineRegion Region { get; }
+        IMGLOfflineRegion Region { get; }
 
 		// @property (readonly, nonatomic) NSData * _Nonnull context;
 		[Export("context")]
@@ -1859,7 +1859,7 @@ interface MGLOfflineStorage
 
 		// -(void)addPackForRegion:(id<MGLOfflineRegion> _Nonnull)region withContext:(NSData * _Nonnull)context completionHandler:(MGLOfflinePackAdditionCompletionHandler _Nullable)completion;
 		[Export("addPackForRegion:withContext:completionHandler:")]
-		void AddPackForRegion(MGLOfflineRegion region, NSData context, [NullAllowed] MGLOfflinePackAdditionCompletionHandler completion);
+		void AddPackForRegion(IMGLOfflineRegion region, NSData context, [NullAllowed] MGLOfflinePackAdditionCompletionHandler completion);
 
 		// -(void)removePack:(MGLOfflinePack * _Nonnull)pack withCompletionHandler:(MGLOfflinePackRemovalCompletionHandler _Nullable)completion;
 		[Export("removePack:withCompletionHandler:")]
@@ -2646,7 +2646,7 @@ interface NSValue_MGLSymbolStyleLayerAdditions
 	// @interface MGLTilePyramidOfflineRegion : NSObject <MGLOfflineRegion, NSSecureCoding, NSCopying>
 	[BaseType(typeof(NSObject))]
 	[DisableDefaultCtor]
-	interface MGLTilePyramidOfflineRegion : IMGLOfflineRegion, INSSecureCoding, INSCopying
+	interface MGLTilePyramidOfflineRegion : MGLOfflineRegion, INSSecureCoding, INSCopying
 	{
 		// @property (readonly, nonatomic) NSURL * _Nonnull styleURL;
 		[Export("styleURL")]

diff --git a/Naxam.Mapbox.iOS/Properties/AssemblyInfo.cs b/Naxam.Mapbox.iOS/Properties/AssemblyInfo.cs
@@ -25,8 +25,8 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("3.6.0")]
-[assembly: AssemblyInformationalVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.0.3")]
+[assembly: AssemblyInformationalVersion("3.6.0.3")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.

diff --git a/Naxam.Mapbox.sln b/Naxam.Mapbox.sln
@@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{D8F96117
 		mapbox-ios.nuspec = mapbox-ios.nuspec
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Naxam.Mapbox.Common", "Naxam.Mapbox.Common\Naxam.Mapbox.Common.csproj", "{A80B2873-6EAF-48A1-8445-2896815EFEE0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -46,6 +48,18 @@ Global
 		{3A2E7243-0208-4292-92B4-8C25F27B9843}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{3A2E7243-0208-4292-92B4-8C25F27B9843}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{3A2E7243-0208-4292-92B4-8C25F27B9843}.Debug|iPhone.Build.0 = Debug|iPhone
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Release|iPhone.Build.0 = Release|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A80B2873-6EAF-48A1-8445-2896815EFEE0}.Debug|iPhone.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/mapbox-ios.nuspec b/mapbox-ios.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <!-- Required elements-->
         <id>Naxam.Mapbox.iOS</id>
-       <version>3.6.0</version>
+       <version>3.6.0.3</version>
         <description>Xamarin binding library for Mapbox iOS SDK</description>
         <authors>Vu Duc Tuyen</authors>
         <owners>NAXAM CO.,LTD</owners>
@@ -12,7 +12,7 @@
         <!-- Optional elements -->
         <title>Naxam - Mapbox iOS</title>
         <summary>Xamarin binding library for Mapbox iOS SDK</summary>
-        <releaseNotes>Mapbox iOS SDK 3.6.0</releaseNotes>
+        <releaseNotes>Fix support for offline packs</releaseNotes>
         <licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
         <projectUrl>https://github.com/kanvuduc/xam-mapbox-ios</projectUrl>
         <copyright>Copyright (c) 2017 NAXAM</copyright>