Updated the portable NuGet to stable 1.1.1

mattleibow · Jan 15, 2015 · eaf799b · eaf799b
1 parent ba7f9cc
commit eaf799b
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 236 deletions.
diff --git a/Portable/library/Flurry.Analytics.Portable/TimedEvent.cs b/Portable/library/Flurry.Analytics.Portable/TimedEvent.cs
@@ -18,10 +18,10 @@ internal TimedEvent(string eventId)
 		internal TimedEvent(string eventId, IDictionary<string, string> parameters)
 		{
 			EventId = eventId;
-            if (parameters != null)
-            {
-                Parameters = new Dictionary<String, string>(parameters);
-            }
+			if (parameters != null)
+			{
+				Parameters = new Dictionary<String, string>(parameters);
+			}
 		}
 
 		/// <summary>
@@ -53,8 +53,6 @@ public void EndEvent()
 		/// <param name="parameters">The parameters associated with the event.</param>
 		public void EndEvent(IDictionary<string, string> parameters)
 		{
-			AnalyticsApi.LogEvent("ËNDING EVENT" + EventId);
-
 			if (parameters == null)
 				AnalyticsApi.EndTimedEvent(EventId);
 			else

diff --git a/Portable/nuget.nuspec b/Portable/nuget.nuspec
@@ -2,31 +2,31 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>Flurry.Analytics.Portable</id>
-        <version>1.1.0-beta1</version>
+        <version>1.1.1</version>
         <title>Flurry Analytics Portable</title>
-        <authors>.NET Development Addict</authors>
+        <authors>Matthew Leibowitz</authors>
         <licenseUrl>https://github.com/mattleibow/Flurry.Analytics/blob/master/FlurryAnalytics/component/License.md</licenseUrl>
         <projectUrl>https://github.com/mattleibow/Flurry.Analytics</projectUrl>
         <iconUrl>https://raw.githubusercontent.com/mattleibow/Flurry.Analytics/master/FlurryAnalytics/component/icons/flurry-analytics_128x128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>The Flurry Analytics Portable API allows you to track the usage and behaviour of your Android, iOS or Windows Phone application on users' phones for viewing in the Flurry Analytics system. It is designed to be as easy as possible with a basic set-up complete in few minutes.</description>
-        <copyright>Flurry, Inc. 2014</copyright>
+        <copyright>Flurry, Inc. and .NET Development Addict</copyright>
         <tags>flurry,analytics,xamarin,ios,windows phone,android,mobile</tags>
         <dependencies>
             <group targetFramework="WindowsPhone7.1">
-                <dependency id="Flurry.Analytics" version="1.1.0-beta1" />
+                <dependency id="Flurry.Analytics" version="1.1.1" />
             </group>
             <group targetFramework="WindowsPhone8.0">
-                <dependency id="Flurry.Analytics" version="1.1.0-beta1" />
+                <dependency id="Flurry.Analytics" version="1.1.1" />
             </group>
             <group targetFramework="MonoTouch1.0">
-                <dependency id="Flurry.Analytics" version="1.1.0-beta1" />
+                <dependency id="Flurry.Analytics" version="1.1.1" />
             </group>
             <group targetFramework="XamariniOS1.0">
-                <dependency id="Flurry.Analytics" version="1.1.0-beta1" />
+                <dependency id="Flurry.Analytics" version="1.1.1" />
             </group>
             <group targetFramework="MonoAndroid1.0">
-                <dependency id="Flurry.Analytics" version="1.1.0-beta1" />
+                <dependency id="Flurry.Analytics" version="1.1.1" />
             </group>
         </dependencies>
     </metadata>

diff --git a/Portable/samples/MvvmCrossSample/MvvmCrossSample.Core/MvvmCrossSample.Core.csproj b/Portable/samples/MvvmCrossSample/MvvmCrossSample.Core/MvvmCrossSample.Core.csproj
@@ -58,7 +58,7 @@
       <HintPath>..\..\packages\MvvmCross.HotTuna.Plugin.Location.3.5.0-beta2\lib\portable-win+net45+wp8+win8+wpa81\Cirrious.MvvmCross.Plugins.Location.dll</HintPath>
     </Reference>
     <Reference Include="Flurry.Analytics.Portable">
-      <HintPath>..\..\packages\Flurry.Analytics.Portable.1.1.0-beta1\lib\portable-wp80+win80+wpa81+net45+sl50+MonoTouch10+MonoAndroid10+XamariniOS10\Flurry.Analytics.Portable.dll</HintPath>
+      <HintPath>..\..\packages\Flurry.Analytics.Portable.1.1.1\lib\portable-wp80+win80+wpa81+net45+sl50+MonoTouch10+MonoAndroid10+XamariniOS10\Flurry.Analytics.Portable.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />

diff --git a/Portable/samples/MvvmCrossSample/MvvmCrossSample.Core/packages.config b/Portable/samples/MvvmCrossSample/MvvmCrossSample.Core/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Flurry.Analytics.Portable" version="1.1.0-beta1" targetFramework="portable-net45+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
+  <package id="Flurry.Analytics.Portable" version="1.1.1" targetFramework="portable-net45+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
   <package id="MvvmCross.HotTuna.CrossCore" version="3.5.0-beta2" targetFramework="portable-net45+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
   <package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.5.0-beta2" targetFramework="portable-net45+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
   <package id="MvvmCross.HotTuna.Plugin.Location" version="3.5.0-beta2" targetFramework="portable-net45+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />

diff --git a/Portable/samples/MvvmCrossSample/MvvmCrossSample.Droid/MvvmCrossSample.Droid.csproj b/Portable/samples/MvvmCrossSample/MvvmCrossSample.Droid/MvvmCrossSample.Droid.csproj
@@ -36,18 +36,18 @@
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Flurry.Analytics.Android">
+      <HintPath>..\..\packages\Flurry.Analytics.1.1.1\lib\MonoAndroid23\Flurry.Analytics.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Flurry.Analytics.Portable">
+      <HintPath>..\..\packages\Flurry.Analytics.Portable.1.1.1\lib\MonoAndroid23\Flurry.Analytics.Portable.dll</HintPath>
+    </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="Flurry.Analytics.Android">
-      <HintPath>..\..\packages\Flurry.Analytics.1.1.0-beta1\lib\MonoAndroid23\Flurry.Analytics.Android.dll</HintPath>
-    </Reference>
-    <Reference Include="Flurry.Analytics.Portable">
-      <HintPath>..\..\packages\Flurry.Analytics.Portable.1.1.0-beta1\lib\MonoAndroid23\Flurry.Analytics.Portable.dll</HintPath>
-    </Reference>
     <Reference Include="Cirrious.CrossCore.Droid">
       <HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-beta2\lib\MonoAndroid\Cirrious.CrossCore.Droid.dll</HintPath>
     </Reference>

diff --git a/Portable/samples/MvvmCrossSample/MvvmCrossSample.Droid/Resources/Resource.Designer.cs b/Portable/samples/MvvmCrossSample/MvvmCrossSample.Droid/Resources/Resource.Designer.cs
diff --git a/Portable/samples/MvvmCrossSample/MvvmCrossSample.Droid/Setup.cs b/Portable/samples/MvvmCrossSample/MvvmCrossSample.Droid/Setup.cs
@@ -20,6 +20,7 @@ public Setup(Context applicationContext)
 			AnalyticsApi.ApiKey = "36TWHT3RMTBTF2G46KGH";
 
 			// Starting and ending the sessions specifically for Android is found in the BaseView
+            AnalyticsApi.Init(applicationContext);
 		}
 
 		protected override IMvxApplication CreateApp()

diff --git a/Portable/samples/MvvmCrossSample/MvvmCrossSample.Droid/packages.config b/Portable/samples/MvvmCrossSample/MvvmCrossSample.Droid/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Flurry.Analytics" version="1.1.0-beta1" targetFramework="MonoAndroid40" />
-  <package id="Flurry.Analytics.Portable" version="1.1.0-beta1" targetFramework="MonoAndroid40" />
+  <package id="Flurry.Analytics" version="1.1.1" targetFramework="MonoAndroid40" />
+  <package id="Flurry.Analytics.Portable" version="1.1.1" targetFramework="MonoAndroid40" />
   <package id="MvvmCross.HotTuna.CrossCore" version="3.5.0-beta2" targetFramework="MonoAndroid40" />
   <package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.5.0-beta2" targetFramework="MonoAndroid40" />
   <package id="MvvmCross.HotTuna.Plugin.Location" version="3.5.0-beta2" targetFramework="MonoAndroid40" />

diff --git a/.../samples/MvvmCrossSample/MvvmCrossSample.WindowsPhone/MvvmCrossSample.WindowsPhone.csproj b/.../samples/MvvmCrossSample/MvvmCrossSample.WindowsPhone/MvvmCrossSample.WindowsPhone.csproj
@@ -184,13 +184,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.5.0-beta2\lib\wp8\Cirrious.MvvmCross.WindowsPhone.dll</HintPath>
     </Reference>
-    <Reference Include="Flurry.Analytics.Portable, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Flurry.Analytics.Portable.1.1.0-beta1\lib\wp8\Flurry.Analytics.Portable.dll</HintPath>
+    <Reference Include="Flurry.Analytics.Portable">
+      <HintPath>..\..\packages\Flurry.Analytics.Portable.1.1.1\lib\wp8\Flurry.Analytics.Portable.dll</HintPath>
     </Reference>
-    <Reference Include="FlurryWP8SDK, Version=3.1.1.0, Culture=neutral, PublicKeyToken=d822942b4ec01210, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Flurry.Analytics.1.1.0-beta1\lib\wp8\FlurryWP8SDK.dll</HintPath>
+    <Reference Include="FlurryWP8SDK">
+      <HintPath>..\..\packages\Flurry.Analytics.1.1.1\lib\wp8\FlurryWP8SDK.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Phone.Controls.Toolkit">
       <HintPath>..\..\packages\WPtoolkit.4.2013.08.16\lib\wp8\Microsoft.Phone.Controls.Toolkit.dll</HintPath>

diff --git a/Portable/samples/MvvmCrossSample/MvvmCrossSample.WindowsPhone/packages.config b/Portable/samples/MvvmCrossSample/MvvmCrossSample.WindowsPhone/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Flurry.Analytics" version="1.1.0-beta1" targetFramework="wp80" />
-  <package id="Flurry.Analytics.Portable" version="1.1.0-beta1" targetFramework="wp80" />
+  <package id="Flurry.Analytics" version="1.1.1" targetFramework="wp80" />
+  <package id="Flurry.Analytics.Portable" version="1.1.1" targetFramework="wp80" />
   <package id="MvvmCross.HotTuna.CrossCore" version="3.5.0-beta2" targetFramework="wp80" />
   <package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.5.0-beta2" targetFramework="wp80" />
   <package id="MvvmCross.HotTuna.Plugin.Location" version="3.5.0-beta2" targetFramework="wp80" />

diff --git a/...le/samples/MvvmCrossSample/MvvmCrossSample.iOS-unified/MvvmCrossSample.iOS-unified.csproj b/...le/samples/MvvmCrossSample/MvvmCrossSample.iOS-unified/MvvmCrossSample.iOS-unified.csproj
@@ -98,16 +98,18 @@
     <CodesignKey>iPhone Distribution</CodesignKey>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Flurry.Analytics.iOS, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Flurry.Analytics.1.1.1\lib\Xamarin.iOS10\Flurry.Analytics.iOS.dll</HintPath>
+    </Reference>
+    <Reference Include="Flurry.Analytics.Portable, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Flurry.Analytics.Portable.1.1.1\lib\XamariniOS10\Flurry.Analytics.Portable.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />
-    <Reference Include="Flurry.Analytics.Portable">
-      <HintPath>..\..\packages\Flurry.Analytics.Portable.1.1.0-beta1\lib\XamariniOS10\Flurry.Analytics.Portable.dll</HintPath>
-    </Reference>
-    <Reference Include="Flurry.Analytics.iOS">
-      <HintPath>..\..\packages\Flurry.Analytics.1.1.0-beta1\lib\Xamarin.iOS10\Flurry.Analytics.iOS.dll</HintPath>
-    </Reference>
     <Reference Include="Cirrious.CrossCore.Touch">
       <HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-beta2\lib\Xamarin.iOS10\Cirrious.CrossCore.Touch.dll</HintPath>
     </Reference>

diff --git a/Portable/samples/MvvmCrossSample/MvvmCrossSample.iOS-unified/packages.config b/Portable/samples/MvvmCrossSample/MvvmCrossSample.iOS-unified/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Flurry.Analytics" version="1.1.0-beta1" targetFramework="xamarinios10" />
-  <package id="Flurry.Analytics.Portable" version="1.1.0-beta1" targetFramework="xamarinios10" />
+  <package id="Flurry.Analytics" version="1.1.1" targetFramework="xamarinios10" />
+  <package id="Flurry.Analytics.Portable" version="1.1.1" targetFramework="xamarinios10" />
   <package id="MvvmCross.HotTuna.CrossCore" version="3.5.0-beta2" targetFramework="xamarinios10" />
   <package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.5.0-beta2" targetFramework="xamarinios10" />
   <package id="MvvmCross.HotTuna.Plugin.Location" version="3.5.0-beta2" targetFramework="xamarinios10" />

diff --git a/Portable/samples/MvvmCrossSample/MvvmCrossSample.iOS/MvvmCrossSample.iOS.csproj b/Portable/samples/MvvmCrossSample/MvvmCrossSample.iOS/MvvmCrossSample.iOS.csproj
@@ -101,6 +101,14 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Flurry.Analytics.iOS, Version=6.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Flurry.Analytics.1.1.1\lib\MonoTouch10\Flurry.Analytics.iOS.dll</HintPath>
+    </Reference>
+    <Reference Include="Flurry.Analytics.Portable, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Flurry.Analytics.Portable.1.1.1\lib\MonoTouch10\Flurry.Analytics.Portable.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Net" />
     <Reference Include="System.Windows" />
@@ -142,12 +150,6 @@
     <Reference Include="CrossUI.Touch">
       <HintPath>..\..\packages\MvvmCross.HotTuna.Touch.Dialog.3.2.2\lib\MonoTouch\CrossUI.Touch.dll</HintPath>
     </Reference>
-    <Reference Include="Flurry.Analytics.iOS">
-      <HintPath>..\..\packages\Flurry.Analytics.1.1.0-beta1\lib\MonoTouch10\Flurry.Analytics.iOS.dll</HintPath>
-    </Reference>
-    <Reference Include="Flurry.Analytics.Portable">
-      <HintPath>..\..\packages\Flurry.Analytics.Portable.1.1.0-beta1\lib\MonoTouch10\Flurry.Analytics.Portable.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />