Merge branch 'master' of github.com:PDFTron/pdftron-react-native

ApryseSDK · Mar 5, 2019 · c6208d0 · c6208d0
2 parents b05e7ed + a114f4e
commit c6208d0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -115,7 +115,8 @@ android {
 
   <application
     ...
-+   android:largeHeap="true">
++   android:largeHeap="true"
++   android:usesCleartextTraffic="true">
 
 +   <meta-data
 +     android:name="pdftron_license_key"

diff --git a/android/build.gradle b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 
@@ -41,6 +41,6 @@ repositories {
 dependencies {
     implementation "com.facebook.react:react-native:+"
 
-    implementation "com.pdftron:pdftron:6.9.5"
-    implementation "com.pdftron:tools:6.9.5"
+    implementation "com.pdftron:pdftron:6.10.0"
+    implementation "com.pdftron:tools:6.10.0"
 }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false"
         android:largeHeap="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true">
 
         <meta-data
             android:name="pdftron_license_key"

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 03 14:36:40 PDT 2018
+#Mon Mar 04 14:41:41 PST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip