Skip to content

Commit

Permalink
Merge pull request #9 from Judopay/updates
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
zfoltin committed Jan 25, 2019
2 parents f8781b6 + 0909c92 commit ce02285
Show file tree
Hide file tree
Showing 6 changed files with 777 additions and 141 deletions.
632 changes: 632 additions & 0 deletions samples/Droid/Resources/Resource.designer.cs

Large diffs are not rendered by default.

175 changes: 89 additions & 86 deletions samples/Droid/Samples.Droid.csproj

Large diffs are not rendered by default.

83 changes: 42 additions & 41 deletions samples/Droid/packages.config
Expand Up @@ -9,7 +9,8 @@
<package id="modernhttpclient" version="2.4.2" targetFramework="monoandroid90" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid90" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="monoandroid90" />
<package id="Serilog" version="2.7.1" targetFramework="monoandroid90" />
<package id="Plugin.CurrentActivity" version="2.1.0.4" targetFramework="monoandroid90" />
<package id="Serilog" version="2.8.0" targetFramework="monoandroid90" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid90" />
Expand Down Expand Up @@ -75,52 +76,52 @@
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid90" />
<package id="Xam.Plugin.Connectivity" version="3.2.0" targetFramework="monoandroid90" />
<package id="Xam.Plugins.Settings" version="3.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Core.Runtime" version="1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.LiveData" version="1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.LiveData.Core" version="1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.ViewModel" version="1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Annotations" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.AsyncLayoutInflater" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Collections" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Compat" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CoordinaterLayout" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Core.UI" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Core.Utils" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CursorAdapter" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CustomView" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Design" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.DocumentFile" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.DrawerLayout" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Fragment" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Interpolator" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Loader" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.LocalBroadcastManager" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Media.Compat" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Print" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.SlidingPaneLayout" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.SwipeRefreshLayout" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Transition" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v4" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.CardView" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.Palette" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.ViewPager" version="28.0.0" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Core.Runtime" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.LiveData" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.LiveData.Core" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.ViewModel" version="1.1.1.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Annotations" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.AsyncLayoutInflater" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Collections" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Compat" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CoordinaterLayout" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Core.UI" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Core.Utils" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CursorAdapter" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CustomView" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Design" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.DocumentFile" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.DrawerLayout" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Fragment" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Interpolator" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Loader" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.LocalBroadcastManager" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Media.Compat" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Print" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.SlidingPaneLayout" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.SwipeRefreshLayout" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Transition" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v4" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.CardView" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.Palette" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.ViewPager" version="28.0.0.1" targetFramework="monoandroid90" />
<package id="Xamarin.Build.Download" version="0.4.11" targetFramework="monoandroid90" />
<package id="Xamarin.DeviceDNA" version="4.2.37" targetFramework="monoandroid90" />
<package id="Xamarin.Forms" version="3.4.0.1009999" targetFramework="monoandroid90" />
<package id="Xamarin.Forms" version="3.4.0.1029999" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Base" version="60.1142.1" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Basement" version="60.1142.1" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Identity" version="60.1142.1" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Maps" version="60.1142.1" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Tasks" version="60.1142.1" targetFramework="monoandroid90" />
<package id="Xamarin.GooglePlayServices.Wallet" version="60.1142.1" targetFramework="monoandroid90" />
<package id="Xamarin.JudoPay" version="4.2.19" targetFramework="monoandroid81" />
<package id="Xamarin.JudoPay" version="4.2.22" targetFramework="monoandroid90" />
</packages>
4 changes: 2 additions & 2 deletions samples/Samples/Samples.csproj
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="Xam.Plugins.Settings" Version="3.1.1" />
<PackageReference Include="Xamarin.Forms" Version="3.4.0.1009999" />
<PackageReference Include="Xamarin.JudoPay" Version="4.2.19" />
<PackageReference Include="Xamarin.Forms" Version="3.4.0.1029999" />
<PackageReference Include="Xamarin.JudoPay" Version="4.2.22" />
</ItemGroup>
</Project>
18 changes: 9 additions & 9 deletions samples/iOS/Samples.iOS.csproj
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.3.4.0.1009999\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.4.0.1009999\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
Expand Down Expand Up @@ -98,7 +98,7 @@
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Serilog">
<HintPath>..\packages\Serilog.2.7.1\lib\netstandard1.3\Serilog.dll</HintPath>
<HintPath>..\packages\Serilog.2.8.0\lib\netstandard2.0\Serilog.dll</HintPath>
</Reference>
<Reference Include="System.Security.Permissions">
<HintPath>..\packages\System.Security.Permissions.4.5.0\lib\netstandard2.0\System.Security.Permissions.dll</HintPath>
Expand All @@ -125,26 +125,26 @@
<HintPath>..\packages\Xamarin.DeviceDNA.4.2.37\lib\Xamarin.iOS10\DeviceDNA.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.3.4.0.1009999\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.3.4.0.1009999\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.3.4.0.1009999\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.3.4.0.1009999\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.4.0.1029999\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="JudoDotNetXamarin">
<HintPath>..\packages\Xamarin.JudoPay.4.2.19\lib\Xamarin.iOS10\JudoDotNetXamarin.dll</HintPath>
<HintPath>..\packages\Xamarin.JudoPay.4.2.22\lib\Xamarin.iOS10\JudoDotNetXamarin.dll</HintPath>
</Reference>
<Reference Include="JudoDotNetXamariniOSSDK">
<HintPath>..\packages\Xamarin.JudoPay.4.2.19\lib\Xamarin.iOS10\JudoDotNetXamariniOSSDK.dll</HintPath>
<HintPath>..\packages\Xamarin.JudoPay.4.2.22\lib\Xamarin.iOS10\JudoDotNetXamariniOSSDK.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -182,5 +182,5 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\Xamarin.Forms.3.4.0.1009999\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.3.4.0.1009999\build\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.3.4.0.1029999\build\Xamarin.Forms.targets')" />
</Project>
6 changes: 3 additions & 3 deletions samples/iOS/packages.config
Expand Up @@ -9,7 +9,7 @@
<package id="modernhttpclient" version="2.4.2" targetFramework="xamarinios10" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="xamarinios10" />
<package id="Serilog" version="2.7.1" targetFramework="xamarinios10" />
<package id="Serilog" version="2.8.0" targetFramework="xamarinios10" />
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="xamarinios10" />
Expand Down Expand Up @@ -76,6 +76,6 @@
<package id="Xam.Plugin.Connectivity" version="3.2.0" targetFramework="xamarinios10" />
<package id="Xam.Plugins.Settings" version="3.1.1" targetFramework="xamarinios10" />
<package id="Xamarin.DeviceDNA" version="4.2.37" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="3.4.0.1009999" targetFramework="xamarinios10" />
<package id="Xamarin.JudoPay" version="4.2.19" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="3.4.0.1029999" targetFramework="xamarinios10" />
<package id="Xamarin.JudoPay" version="4.2.22" targetFramework="xamarinios10" />
</packages>

0 comments on commit ce02285

Please sign in to comment.