Skip to content

Commit 1ac7bf3

Browse files
dalexsotodalexsoto
committed
[PSPDFKit.Android] Update bindings to v8.4.0
1 parent f890d8d commit 1ac7bf3

File tree

10 files changed

+45
-40
lines changed

10 files changed

+45
-40
lines changed

‎PSPDFKit.Android/PSPDFKit.Android.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<!-- <EmbeddedReferenceJar Include="Jars\okio-1.13.0.jar" /> -->
8282
</ItemGroup>
8383
<ItemGroup>
84-
<LibraryProjectZip Include="Jars\pspdfkit-8.2.1.aar" />
84+
<LibraryProjectZip Include="Jars\pspdfkit-8.4.0.aar" />
8585
</ItemGroup>
8686
<!-- <ItemGroup>
8787
<EmbeddedJar Include="Jars\YouTubeAndroidPlayerApi-1.2.2\libs\YouTubeAndroidPlayerApi.jar">
@@ -90,18 +90,18 @@
9090
</ItemGroup> -->
9191
<ItemGroup>
9292
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.14" />
93-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.4.2.1" />
94-
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.8.0.1" />
93+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1" />
94+
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0" />
9595
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.7" />
9696
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.16" />
9797
<PackageReference Include="Xamarin.AndroidX.GridLayout" Version="1.0.0.14" />
9898
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.14" />
9999
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
100-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.4.1.2" />
100+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1" />
101101
<PackageReference Include="Xamarin.AndroidX.MultiDex" Version="2.0.1.14" />
102102
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.4.0.2" />
103-
<PackageReference Include="Square.OkHttp3" Version="4.9.3.1" />
104-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.7.0" />
103+
<PackageReference Include="Square.OkHttp3" Version="4.9.3.2" />
104+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.7.10" />
105105
<PackageReference Include="Xamarin.Android.ReactiveX.RxAndroid" Version="2.1.1.1" />
106106
<PackageReference Include="Xamarin.Android.ReactiveX.RxJava" Version="2.2.21.7" />
107107
</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 ("8.2.1")]
22+
[assembly: AssemblyVersion ("8.4.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: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<remove-node path="//class['Impl' = substring(substring-before(@name,'.') , string-length(substring-before(@name,'.')) - 3)]" />
1212

1313
<!-- Removes any "constructor" that any of its parameters uses any of the types contained in com.pspdfkit.internal.* -->
14-
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.i1')]" />
15-
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.ed')]" />
16-
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.ri')]" />
17-
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.u4')]" />
14+
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.l1')]" />
15+
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.ld')]" />
16+
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.qj')]" />
17+
<remove-node path="//constructor/parameter[contains(@type, 'com.pspdfkit.internal.x4')]" />
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 -->
@@ -40,6 +40,7 @@
4040
<attr path="/api/package[@name='com.pspdfkit.annotations.appearance']" name="managedName">PSPDFKit.Annotations.Appearance</attr>
4141
<attr path="/api/package[@name='com.pspdfkit.annotations.defaults']" name="managedName">PSPDFKit.Annotations.Defaults</attr>
4242
<attr path="/api/package[@name='com.pspdfkit.annotations.links']" name="managedName">PSPDFKit.Annotations.Links</attr>
43+
<attr path="/api/package[@name='com.pspdfkit.annotations.measurements']" name="managedName">PSPDFKit.Annotations.Measurements</attr>
4344
<attr path="/api/package[@name='com.pspdfkit.annotations.note']" name="managedName">PSPDFKit.Annotations.Note</attr>
4445
<attr path="/api/package[@name='com.pspdfkit.annotations.sound']" name="managedName">PSPDFKit.Annotations.Sound</attr>
4546
<attr path="/api/package[@name='com.pspdfkit.annotations.stamps']" name="managedName">PSPDFKit.Annotations.Stamps</attr>
@@ -200,6 +201,9 @@
200201
<attr path="/api/package[@name='com.pspdfkit.annotations.configuration']/interface[@name='InkAnnotationConfiguration.Builder']/method[@name='build']" name="managedReturn">PSPDFKit.Annotations.Configuration.IAnnotationConfiguration</attr>
201202
<attr path="/api/package[@name='com.pspdfkit.annotations.configuration']/interface[@name='ShapeAnnotationConfiguration.Builder']/method[@name='build']" name="managedReturn">PSPDFKit.Annotations.Configuration.IAnnotationConfiguration</attr>
202203
<attr path="/api/package[@name='com.pspdfkit.annotations.configuration']/interface[@name='SoundAnnotationConfiguration.Builder']/method[@name='build']" name="managedReturn">PSPDFKit.Annotations.Configuration.IAnnotationConfiguration</attr>
204+
<attr path="/api/package[@name='com.pspdfkit.annotations.configuration']/interface[@name='MeasurementDistanceAnnotationConfiguration.Builder']/method[@name='build']" name="managedReturn">PSPDFKit.Annotations.Configuration.IAnnotationConfiguration</attr>
205+
<attr path="/api/package[@name='com.pspdfkit.annotations.configuration']/interface[@name='MeasurementAreaAnnotationConfiguration.Builder']/method[@name='build']" name="managedReturn">PSPDFKit.Annotations.Configuration.IAnnotationConfiguration</attr>
206+
<attr path="/api/package[@name='com.pspdfkit.annotations.configuration']/interface[@name='MeasurementPerimeterAnnotationConfiguration.Builder']/method[@name='build']" name="managedReturn">PSPDFKit.Annotations.Configuration.IAnnotationConfiguration</attr>
203207
<!-- The following break the generator really bad brcause they share the same simbol name. -->
204208
<remove-node path="/api/package[@name='com.pspdfkit.annotations.configuration']/interface[@name='AnnotationFillColorConfiguration.Builder']/method[@name='setCustomColorPickerEnabled']" />
205209
<remove-node path="/api/package[@name='com.pspdfkit.annotations.configuration']/interface[@name='AnnotationOutlineColorConfiguration.Builder']/method[@name='setCustomColorPickerEnabled']" />
@@ -224,6 +228,8 @@
224228

225229
<attr path="/api/package[@name='com.pspdfkit.ui.overlay']/class[@name='OverlayLayoutParams']/field[@name='layoutPosition']" name="managedName">LayoutPositionField</attr>
226230
<attr path="/api/package[@name='com.pspdfkit.ui.overlay']/class[@name='OverlayLayoutParams']/field[@name='sizingMode']" name="managedName">SizingModeField</attr>
231+
<attr path="/api/package[@name='com.pspdfkit.annotations.measurements']/class[@name='Scale']/field[@name='unitFrom']" name="managedName">UnitFromField</attr>
232+
<attr path="/api/package[@name='com.pspdfkit.annotations.measurements']/class[@name='Scale']/field[@name='unitTo']" name="managedName">UnitToField</attr>
227233

228234
<attr path="/api/package[@name='com.pspdfkit.ui']/class[@name='BasePdfUiBuilder']" name="visibility">public</attr>
229235
<attr path="/api/package[@name='com.pspdfkit.ui']/class[@name='PdfActivityIntentBuilder']" name="extends">java.lang.Object</attr>

‎README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Xamarin PSPDFKit.Android Bindings
22

3-
Xamarin.Android Bindings for PSPDFKit `v8.2.1`.
3+
Xamarin.Android Bindings for PSPDFKit `v8.4.0`.
44

55
#### PSPDFKit
66

@@ -24,12 +24,11 @@ To make sure this is fast, please use a work email and have someone from your co
2424

2525
PSPDFKit runs on Android devices running:
2626

27-
* **Xamarin.Android >= 9.4.1.0**
28-
* **Microsoft Mobile OpenJDK 1.8.0**
27+
* **Xamarin.Android >= 13.0.0.0**
28+
* **Microsoft Mobile OpenJDK >= 11.0**
2929
* Android **4.4** or newer / API level **19** or higher
3030
* 32/64-bit ARM (armeabi-v7a with NEON/ arm64-v8a) or 32/64-bit Intel x86 CPU.
31-
* Projects using PSPDFKit.Android.dll **must** set [Target Framework](https://developer.xamarin.com/guides/android/application_fundamentals/understanding_android_api_levels/#framework) to **API 29 (Android 10.0)** or higher.
32-
* In your Android Options select `d8` as your `Dex compiler`. Otherwise you will get errors about default interface methods not being supported.
31+
* Projects using PSPDFKit.Android.dll **must** set [Target Framework](https://developer.xamarin.com/guides/android/application_fundamentals/understanding_android_api_levels/#framework) to **API 31 (Android 12.0)** or higher.
3332

3433
## Integrating PSPDFKit
3534

‎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 = "8.2.1";
8+
var PSPDFKIT_VERSION = "8.4.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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
<dependencies>
2424
<group targetFramework="MonoAndroid12.0">
2525
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.14" include="All" />
26-
<dependency id="Xamarin.AndroidX.AppCompat" version="1.4.2.1" include="All" />
27-
<dependency id="Xamarin.AndroidX.Core" version="1.8.0.1" include="All" />
26+
<dependency id="Xamarin.AndroidX.AppCompat" version="1.5.1" include="All" />
27+
<dependency id="Xamarin.AndroidX.Core" version="1.9.0" include="All" />
2828
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.2.1.7" include="All" />
2929
<dependency id="Xamarin.AndroidX.CardView" version="1.0.0.16" include="All" />
3030
<dependency id="Xamarin.AndroidX.GridLayout" version="1.0.0.14" include="All" />
3131
<dependency id="Xamarin.AndroidX.Palette" version="1.0.0.14" include="All" />
3232
<dependency id="Xamarin.Google.Android.Material" version="1.6.1.1" include="All" />
33-
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.4.1.2" include="All" />
33+
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.5.1" include="All" />
3434
<dependency id="Xamarin.AndroidX.MultiDex" version="2.0.1.14" include="All" />
3535
<dependency id="Xamarin.AndroidX.Browser" version="1.4.0.2" include="All" />
36-
<dependency id="Square.OkHttp3" version="4.9.3.1" include="All" />
37-
<dependency id="Xamarin.Kotlin.StdLib" version="1.7.0" include="All" />
36+
<dependency id="Square.OkHttp3" version="4.9.3.2" include="All" />
37+
<dependency id="Xamarin.Kotlin.StdLib" version="1.7.10" include="All" />
3838
<dependency id="Xamarin.Android.ReactiveX.RxAndroid" version="2.1.1.1" include="All" />
3939
<dependency id="Xamarin.Android.ReactiveX.RxJava" version="2.2.21.7" include="All" />
4040
</group>

‎samples/AndroidSample/AndroidSample/AndroidSample.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,18 @@
9191
<ItemGroup>
9292
<PackageReference Include="AndHUD" Version="1.5.0" />
9393
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.14" />
94-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.4.2.1" />
95-
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.8.0.1" />
94+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1" />
95+
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0" />
9696
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.7" />
9797
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.16" />
9898
<PackageReference Include="Xamarin.AndroidX.GridLayout" Version="1.0.0.14" />
9999
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.14" />
100100
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
101-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.4.1.2" />
101+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1" />
102102
<PackageReference Include="Xamarin.AndroidX.MultiDex" Version="2.0.1.14" />
103103
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.4.0.2" />
104-
<PackageReference Include="Square.OkHttp3" Version="4.9.3.1" />
105-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.7.0" />
104+
<PackageReference Include="Square.OkHttp3" Version="4.9.3.2" />
105+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.7.10" />
106106
<PackageReference Include="Xamarin.Android.ReactiveX.RxAndroid" Version="2.1.1.1" />
107107
<PackageReference Include="Xamarin.Android.ReactiveX.RxJava" Version="2.2.21.7" />
108108
</ItemGroup>

‎samples/PSPDFCatalog/PSPDFCatalog.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,23 +243,23 @@
243243
</ItemGroup>
244244
<ItemGroup>
245245
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.14" />
246-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.4.2.1" />
246+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1" />
247247
<PackageReference Include="Xamarin.AndroidX.AppCompat.Resources" Version="1.1.0.1" />
248-
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.8.0.1" />
248+
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0" />
249249
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.7" />
250250
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.16" />
251251
<PackageReference Include="Xamarin.AndroidX.GridLayout" Version="1.0.0.14" />
252252
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.14" />
253253
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
254-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.4.1.2" />
254+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1" />
255255
<PackageReference Include="Xamarin.AndroidX.MultiDex" Version="2.0.1.14" />
256256
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.4.0.2" />
257-
<PackageReference Include="Square.OkHttp3" Version="4.9.3.1" />
258-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.7.0" />
257+
<PackageReference Include="Square.OkHttp3" Version="4.9.3.2" />
258+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.7.10" />
259259
<PackageReference Include="Xamarin.Android.ReactiveX.RxAndroid" Version="2.1.1.1" />
260260
<PackageReference Include="Xamarin.Android.ReactiveX.RxJava" Version="2.2.21.7" />
261261
<PackageReference Include="AndHUD" Version="1.5.0" />
262-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2478" />
262+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
263263
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
264264
<PackageReference Include="Plugin.CurrentActivity" Version="2.1.0.4" />
265265
<PackageReference Include="Plugin.Permissions" Version="6.0.1" />

‎samples/XamarinForms/Droid/XFSample.Droid.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,22 @@
103103
</ItemGroup>
104104
<ItemGroup>
105105
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.14" />
106-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.4.2.1" />
106+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.5.1" />
107107
<PackageReference Include="Xamarin.AndroidX.AppCompat.Resources" Version="1.1.0.1" />
108-
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.8.0.1" />
108+
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0" />
109109
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.7" />
110110
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.16" />
111111
<PackageReference Include="Xamarin.AndroidX.GridLayout" Version="1.0.0.14" />
112112
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.14" />
113113
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
114-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.4.1.2" />
114+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1" />
115115
<PackageReference Include="Xamarin.AndroidX.MultiDex" Version="2.0.1.14" />
116116
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.4.0.2" />
117-
<PackageReference Include="Square.OkHttp3" Version="4.9.3.1" />
118-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.7.0" />
117+
<PackageReference Include="Square.OkHttp3" Version="4.9.3.2" />
118+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.7.10" />
119119
<PackageReference Include="Xamarin.Android.ReactiveX.RxAndroid" Version="2.1.1.1" />
120120
<PackageReference Include="Xamarin.Android.ReactiveX.RxJava" Version="2.2.21.7" />
121-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2478" />
121+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
122122
<PackageReference Include="Plugin.CurrentActivity" Version="2.1.0.4" />
123123
</ItemGroup>
124124
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />

‎samples/XamarinForms/XFSample/XFSample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<ItemGroup>
88
<PackageReference Include="Plugin.Permissions" Version="6.0.1" />
9-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2478" />
9+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<None Remove=".DS_Store" />

0 commit comments

Comments
 (0)