From fbba834bc5e47ede9e8d7cd2864eee76af780499 Mon Sep 17 00:00:00 2001 From: ama-pdftron Date: Mon, 25 Nov 2024 15:41:32 -0800 Subject: [PATCH 1/4] Update Android to 11.1.0 --- .../react-native-pdftron/android/build.gradle | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 example/node_modules/react-native-pdftron/android/build.gradle diff --git a/example/node_modules/react-native-pdftron/android/build.gradle b/example/node_modules/react-native-pdftron/android/build.gradle new file mode 100644 index 00000000..dc3df3fb --- /dev/null +++ b/example/node_modules/react-native-pdftron/android/build.gradle @@ -0,0 +1,73 @@ + +buildscript { + def kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : "1.8.22" + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:4.2.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + } +} + +rootProject.allprojects { + repositories { + google() + mavenCentral() + maven { + url "https://pdftron-maven.s3.amazonaws.com/release" + } + } +} + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' + +android { + compileSdkVersion 33 + buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : "30.0.2" + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 33 + versionCode 1 + versionName "1.0" + vectorDrawables.useSupportLibrary = true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = '17' + } + lintOptions { + abortOnError false + } +} + +repositories { + maven { + // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm + // Matches the RN Hello World template + // https://github.com/facebook/react-native/blob/1e8f3b11027fe0a7514b4fc97d0798d3c64bc895/local-cli/templates/HelloWorld/android/build.gradle#L21 + url "$projectDir/../node_modules/react-native/android" + } + mavenCentral() +} + +dependencies { + implementation "com.facebook.react:react-native:+" + + implementation 'androidx.fragment:fragment:1.5.1' + + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' + + implementation "com.pdftron:pdftron:11.0.0" + implementation "com.pdftron:tools:11.0.0" + implementation "com.pdftron:collab:11.0.0" +} From 3c63a5f71ec1596f12c889ccd832bf2e9b1e5170 Mon Sep 17 00:00:00 2001 From: ama-pdftron Date: Mon, 25 Nov 2024 15:42:29 -0800 Subject: [PATCH 2/4] Update build.gradle --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index dc3df3fb..13cb4573 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' - implementation "com.pdftron:pdftron:11.0.0" - implementation "com.pdftron:tools:11.0.0" - implementation "com.pdftron:collab:11.0.0" + implementation "com.pdftron:pdftron:11.1.0" + implementation "com.pdftron:tools:11.1.0" + implementation "com.pdftron:collab:11.1.0" } From 5b8ad27aa1b4068afce0d5b451d072f4d32618a4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 23:46:26 +0000 Subject: [PATCH 3/4] Updating package version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7692718e..66630387 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "react-native-pdftron", "title": "React Native Pdftron", - "version": "3.0.4-9", + "version": "3.0.4-10", "description": "React Native Pdftron", "main": "./lib/index.js", "typings": "index.ts", From 9ad56f3a4f4f833216d7de1ee7b514ab87e88fad Mon Sep 17 00:00:00 2001 From: ama-pdftron <83238520+ama-pdftron@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:47:35 -0800 Subject: [PATCH 4/4] Delete example/node_modules/react-native-pdftron/android/build.gradle --- .../react-native-pdftron/android/build.gradle | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 example/node_modules/react-native-pdftron/android/build.gradle diff --git a/example/node_modules/react-native-pdftron/android/build.gradle b/example/node_modules/react-native-pdftron/android/build.gradle deleted file mode 100644 index dc3df3fb..00000000 --- a/example/node_modules/react-native-pdftron/android/build.gradle +++ /dev/null @@ -1,73 +0,0 @@ - -buildscript { - def kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : "1.8.22" - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:4.2.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - } -} - -rootProject.allprojects { - repositories { - google() - mavenCentral() - maven { - url "https://pdftron-maven.s3.amazonaws.com/release" - } - } -} - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' - -android { - compileSdkVersion 33 - buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : "30.0.2" - - defaultConfig { - minSdkVersion 21 - targetSdkVersion 33 - versionCode 1 - versionName "1.0" - vectorDrawables.useSupportLibrary = true - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - kotlinOptions { - jvmTarget = '17' - } - lintOptions { - abortOnError false - } -} - -repositories { - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - // Matches the RN Hello World template - // https://github.com/facebook/react-native/blob/1e8f3b11027fe0a7514b4fc97d0798d3c64bc895/local-cli/templates/HelloWorld/android/build.gradle#L21 - url "$projectDir/../node_modules/react-native/android" - } - mavenCentral() -} - -dependencies { - implementation "com.facebook.react:react-native:+" - - implementation 'androidx.fragment:fragment:1.5.1' - - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' - - implementation "com.pdftron:pdftron:11.0.0" - implementation "com.pdftron:tools:11.0.0" - implementation "com.pdftron:collab:11.0.0" -}