Merge pull request #342 from PSPDFKit/reinhard/update-pspdfkit-6.1.1

Reinhard Hafenscher · web-flow · commit c1d9a8f43792 · 2020-01-21T17:39:58.000+01:00
Update to PSPDFKit for Android 6.1.1
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,7 +2,7 @@
 *   Contains gradle configuration constants
 */
 ext {
-    PSPDFKIT_VERSION = '6.1.0'
+    PSPDFKIT_VERSION = '6.1.1'
 }
 
 buildscript {
@@ -69,8 +69,8 @@ if (demoVersion) {
 }
 
 dependencies {
-    compile("com.pspdfkit:pspdfkit:${PSPDFKIT_VERSION}") {
+    implementation("com.pspdfkit:pspdfkit:${PSPDFKIT_VERSION}") {
         exclude group: 'com.google.auto.value', module: 'auto-value'
     }
-    compile "com.facebook.react:react-native:+"
+    implementation "com.facebook.react:react-native:+"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "1.26.6",
+  "version": "1.26.7",
   "description": "A React Native module for the PSPDFKit library.",
   "keywords": [
     "react native",
diff --git a/samples/Catalog/android/gradle.properties b/samples/Catalog/android/gradle.properties
@@ -17,8 +17,6 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-android.useDeprecatedNdk=true
-android.enableAapt2=false
 android.enableDesugar=true
 org.gradle.configureondemand=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
diff --git a/samples/Catalog/package.json b/samples/Catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Catalog",
-  "version": "1.26.6",
+  "version": "1.26.7",
   "private": true,
   "scripts": {
     "start": "react-native start",
diff --git a/samples/NativeCatalog/package.json b/samples/NativeCatalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "NativeCatalog",
-  "version": "1.26.6",
+  "version": "1.26.7",
   "private": true,
   "scripts": {
     "android": "react-native run-android",

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Contains gradle configuration constants`
`3`	`3`	`*/`
`4`	`4`	`ext {`
`5`		`- PSPDFKIT_VERSION = '6.1.0'`
	`5`	`+ PSPDFKIT_VERSION = '6.1.1'`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`buildscript {`
`@@ -69,8 +69,8 @@ if (demoVersion) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`dependencies {`
`72`		`- compile("com.pspdfkit:pspdfkit:${PSPDFKIT_VERSION}") {`
	`72`	`+ implementation("com.pspdfkit:pspdfkit:${PSPDFKIT_VERSION}") {`
`73`	`73`	`exclude group: 'com.google.auto.value', module: 'auto-value'`
`74`	`74`	`}`
`75`		`- compile "com.facebook.react:react-native:+"`
	`75`	`+ implementation "com.facebook.react:react-native:+"`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-native-pspdfkit",`
`3`		`- "version": "1.26.6",`
	`3`	`+ "version": "1.26.7",`
`4`	`4`	`"description": "A React Native module for the PSPDFKit library.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"react native",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Catalog",`
`3`		`- "version": "1.26.6",`
	`3`	`+ "version": "1.26.7",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"start": "react-native start",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "NativeCatalog",`
`3`		`- "version": "1.26.6",`
	`3`	`+ "version": "1.26.7",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"android": "react-native run-android",`