Skip to content

Commit aa1666e

Browse files
dalexsotodalexsoto
committed
[PSPDFKit.Android] Update bindings to v7.0.0
1 parent 3d799d0 commit aa1666e

File tree

14 files changed

+44
-33
lines changed

14 files changed

+44
-33
lines changed

‎PSPDFKit.Android/PSPDFKit.Android.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1313
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
1414
<AssemblyName>PSPDFKit.Android</AssemblyName>
15-
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
1616
<JavaOptions>$(JavaOptions) -noverify </JavaOptions>
1717
<AndroidClassParser>class-parse</AndroidClassParser>
1818
<AndroidCodeGenTarget>XAJavaInterop1</AndroidCodeGenTarget>
@@ -81,7 +81,7 @@
8181
<!-- <EmbeddedReferenceJar Include="Jars\okio-1.13.0.jar" /> -->
8282
</ItemGroup>
8383
<ItemGroup>
84-
<LibraryProjectZip Include="Jars\pspdfkit-6.6.2.aar" />
84+
<LibraryProjectZip Include="Jars\pspdfkit-7.0.0.aar" />
8585
</ItemGroup>
8686
<!-- <ItemGroup>
8787
<EmbeddedJar Include="Jars\YouTubeAndroidPlayerApi-1.2.2\libs\YouTubeAndroidPlayerApi.jar">
@@ -90,8 +90,9 @@
9090
</ItemGroup> -->
9191
<ItemGroup>
9292
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
93-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.2.0.7" />
94-
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.0" />
93+
<PackageReference Include="Xamarin.AndroidX.AppCompat" version="1.3.0" />
94+
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.6.0" />
95+
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1" />
9596
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.8" />
9697
<PackageReference Include="Xamarin.AndroidX.GridLayout" Version="1.0.0.7" />
9798
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.7" />
@@ -100,7 +101,7 @@
100101
<PackageReference Include="Xamarin.AndroidX.MultiDex" Version="2.0.1.7" />
101102
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.5" />
102103
<PackageReference Include="Square.OkHttp3" Version="4.9.1" />
103-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.5.10" />
104+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.5.21" />
104105
<PackageReference Include="Xamarin.Android.ReactiveX.RxAndroid" Version="2.1.1.1" />
105106
<PackageReference Include="Xamarin.Android.ReactiveX.RxJava" Version="2.2.10.1" />
106107
</ItemGroup>

‎PSPDFKit.Android/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
2020
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
2121

22-
[assembly: AssemblyVersion ("6.6.2")]
22+
[assembly: AssemblyVersion ("7.0.0")]
2323
[assembly: LinkerSafe]
2424

2525
// The following attributes are used to specify the signing key for the assembly,

‎PSPDFKit.Android/Transforms/Metadata.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<remove-node path="//class['Impl' = substring(substring-before(@name,'.') , string-length(substring-before(@name,'.')) - 3)]" />
1313

1414
<!-- Removes any "constructor" that any of its parameters uses any of the types contained in com.pspdfkit.internal.* -->
15-
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.j0')]" />
16-
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.tb')]" />
17-
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.m8')]" />
15+
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.q0')]" />
16+
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.bc')]" />
17+
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.u8')]" />
1818
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.jni.NativeAnnotation')]" />
1919
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.jni.NativeFormField')]" />
2020
<!-- Not creating a general rule to avoid bug reported by David -->

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Xamarin PSPDFKit.Android Bindings
22

3-
Xamarin.Android Bindings for PSPDFKit `v6.6.2`.
3+
Xamarin.Android Bindings for PSPDFKit `v7.0.0`.
44

55
#### PSPDFKit
66

‎build.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var target = Argument ("target", "Default");
55
// Nice online pom dependency explorer
66
// https://jar-download.com/
77

8-
var PSPDFKIT_VERSION = "6.6.2";
8+
var PSPDFKIT_VERSION = "7.0.0";
99
var SERVICERELEASE_VERSION = "0"; // This is combined with the PSPDFKIT_VERSION variable for the NuGet Package version
1010
var RXANDROID_VERSION = "2.1.0";
1111
var RXJAVA_VERSION = "2.2.4"; // Check Reactive-Streams if updated.

‎nuget/pspdfkit-android.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
<dependencies>
2424
<group targetFramework="MonoAndroid9.0">
2525
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.7" include="All" />
26-
<dependency id="Xamarin.AndroidX.AppCompat" version="1.2.0.7" include="All" />
27-
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.2.0" include="All" />
26+
<dependency id="Xamarin.AndroidX.AppCompat" version="1.3.0" include="All" />
27+
<dependency id="Xamarin.AndroidX.Core" version="1.6.0" include="All" />
28+
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.2.1" include="All" />
2829
<dependency id="Xamarin.AndroidX.CardView" version="1.0.0.8" include="All" />
2930
<dependency id="Xamarin.AndroidX.GridLayout" version="1.0.0.7" include="All" />
3031
<dependency id="Xamarin.AndroidX.Palette" version="1.0.0.7" include="All" />
@@ -33,7 +34,7 @@
3334
<dependency id="Xamarin.AndroidX.MultiDex" version="2.0.1.7" include="All" />
3435
<dependency id="Xamarin.AndroidX.Browser" version="1.3.0.5" include="All" />
3536
<dependency id="Square.OkHttp3" version="4.9.1" include="All" />
36-
<dependency id="Xamarin.Kotlin.StdLib" version="1.5.10" include="All" />
37+
<dependency id="Xamarin.Kotlin.StdLib" version="1.5.21" include="All" />
3738
<dependency id="Xamarin.Android.ReactiveX.RxAndroid" version="2.1.1.1" include="All" />
3839
<dependency id="Xamarin.Android.ReactiveX.RxJava" version="2.2.10.1" include="All" />
3940
</group>

‎samples/AndroidSample/AndroidSample/AndroidSample.csproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<AndroidApplication>True</AndroidApplication>
1717
<AssemblyName>AndroidSample</AssemblyName>
1818
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
19-
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
2020
<AndroidDexTool>d8</AndroidDexTool>
2121
<AndroidEnableMultiDex>true</AndroidEnableMultiDex>
2222
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -33,6 +33,7 @@
3333
<ConsolePause>false</ConsolePause>
3434
<AndroidSupportedAbis>arm64-v8a;x86;x86_64;armeabi-v7a</AndroidSupportedAbis>
3535
<AndroidR8ExtraArguments>--pg-conf "$(MSBuildProjectDirectory)\pspdfkit-proguard.cfg"</AndroidR8ExtraArguments>
36+
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
3637
</PropertyGroup>
3738
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3839
<DebugType>full</DebugType>
@@ -90,8 +91,9 @@
9091
<ItemGroup>
9192
<PackageReference Include="AndHUD" Version="1.4.3" />
9293
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
93-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.2.0.7" />
94-
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.0" />
94+
<PackageReference Include="Xamarin.AndroidX.AppCompat" version="1.3.0" />
95+
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.6.0" />
96+
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1" />
9597
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.8" />
9698
<PackageReference Include="Xamarin.AndroidX.GridLayout" Version="1.0.0.7" />
9799
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.7" />
@@ -100,7 +102,7 @@
100102
<PackageReference Include="Xamarin.AndroidX.MultiDex" Version="2.0.1.7" />
101103
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.5" />
102104
<PackageReference Include="Square.OkHttp3" Version="4.9.1" />
103-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.5.10" />
105+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.5.21" />
104106
<PackageReference Include="Xamarin.Android.ReactiveX.RxAndroid" Version="2.1.1.1" />
105107
<PackageReference Include="Xamarin.Android.ReactiveX.RxJava" Version="2.2.10.1" />
106108
</ItemGroup>

‎samples/AndroidSample/AndroidSample/Assets/demo.pdf‎

4.4 MB
Binary file not shown.

‎samples/AndroidSample/AndroidSample/Properties/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.pspdfkit.sample">
3-
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
44
<application android:label="@string/app_name" android:largeHeap="true" android:theme="@style/AppTheme">
55
<activity android:name="com.pspdfkit.ui.PdfActivity" />
66
</application>

‎samples/PSPDFCatalog/PSPDFCatalog.csproj‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<OutputType>Library</OutputType>
1111
<RootNamespace>PSPDFCatalog</RootNamespace>
1212
<AssemblyName>PSPDFCatalog</AssemblyName>
13-
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
1414
<AndroidApplication>True</AndroidApplication>
1515
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
1616
<AndroidResgenClass>Resource</AndroidResgenClass>
@@ -37,6 +37,10 @@
3737
<AndroidTlsProvider>btls</AndroidTlsProvider>
3838
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
3939
<AndroidR8ExtraArguments>--pg-conf "$(MSBuildProjectDirectory)\..\AndroidSample\AndroidSample\pspdfkit-proguard.cfg"</AndroidR8ExtraArguments>
40+
<AndroidPackageFormat></AndroidPackageFormat>
41+
<EnableLLVM>false</EnableLLVM>
42+
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
43+
<AndroidPackageFormat>apk</AndroidPackageFormat>
4044
</PropertyGroup>
4145
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4246
<DebugSymbols>true</DebugSymbols>
@@ -237,9 +241,10 @@
237241
</ItemGroup>
238242
<ItemGroup>
239243
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
240-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.2.0.7" />
244+
<PackageReference Include="Xamarin.AndroidX.AppCompat" version="1.3.0" />
241245
<PackageReference Include="Xamarin.AndroidX.AppCompat.Resources" Version="1.1.0.1" />
242-
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.0" />
246+
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.6.0" />
247+
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1" />
243248
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.8" />
244249
<PackageReference Include="Xamarin.AndroidX.GridLayout" Version="1.0.0.7" />
245250
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.7" />
@@ -248,11 +253,11 @@
248253
<PackageReference Include="Xamarin.AndroidX.MultiDex" Version="2.0.1.7" />
249254
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.5" />
250255
<PackageReference Include="Square.OkHttp3" Version="4.9.1" />
251-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.5.10" />
256+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.5.21" />
252257
<PackageReference Include="Xamarin.Android.ReactiveX.RxAndroid" Version="2.1.1.1" />
253258
<PackageReference Include="Xamarin.Android.ReactiveX.RxJava" Version="2.2.10.1" />
254259
<PackageReference Include="AndHUD" Version="1.4.3" />
255-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
260+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
256261
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
257262
<PackageReference Include="Plugin.CurrentActivity" Version="2.1.0.4" />
258263
<PackageReference Include="Plugin.Permissions" Version="6.0.1" />

0 commit comments

Comments
 (0)