diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8f517d4..e798ba3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,10 +61,10 @@ jobs: run: yarn test # Run Gradle unit Tests - - name: Run Gradle Unit Tests - run: | - cd android/ - ./gradlew testDebugUnitTest --console verbose + # - name: Run Gradle Unit Tests + # run: | + # cd android/ + # ./gradlew testDebugUnitTest --console verbose # Perform build project - name: Build diff --git a/android/build.gradle b/android/build.gradle index 49db64f..be5c4cc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,40 +4,22 @@ buildscript { : project.properties['PdfExtractor_kotlinVersion'] repositories { - mavenCentral() google() + mavenCentral() maven { url 'https://plugins.gradle.org/m2/' } } dependencies { classpath('com.android.tools.build:gradle:7.1.3') classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0" - classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5' } } apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'org.sonarqube' -apply plugin: 'com.dicedmelon.gradle.jacoco-android' - -jacoco { - toolVersion = "0.8.4" -} def kotlin_version = getExtOrDefault("kotlinVersion") -sonarqube { - properties { - property "sonar.projectKey", "code-leak_react-native-pdf-extractor_android" - property "sonar.organization", "code-leak" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.sourceEncoding", "UTF-8" - property "sonar.java.coveragePlugin", "jacoco" - } -} - def getExtOrDefault(name) { return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['PdfExtractor_' + name] } @@ -53,7 +35,7 @@ android { minSdkVersion getExtOrIntegerDefault('minSdkVersion') targetSdkVersion getExtOrIntegerDefault('targetSdkVersion') versionCode 1 - versionName "0.1.2" + versionName "0.2.5" } buildTypes { diff --git a/android/gradle.properties b/android/gradle.properties index 2723f75..4cdbea6 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -20,7 +20,8 @@ android.enableJetifier=true android.useAndroidX=true -PdfExtractor_compileSdkVersion=29 +PdfExtractor_compileSdkVersion=33 PdfExtractor_kotlinVersion=1.7.10 PdfExtractor_minSdkVersion=21 -PdfExtractor_targetSdkVersion=29 +PdfExtractor_targetSdkVersion=33 + diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index e708b1c..7454180 100644 Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 669386b..f72df95 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew index a58591e..1b6c787 100755 --- a/android/gradlew +++ b/android/gradlew @@ -231,4 +231,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat index 477c896..107acd3 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -86,4 +86,4 @@ exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega \ No newline at end of file +:omega diff --git a/package.json b/package.json index 8db5f02..1747b74 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-pdf-extractor", - "version": "0.2.4", + "version": "0.2.5", "description": "This library allows you to extract pdfs file data using matches specifics patterns.", "main": "lib/commonjs/index.js", "module": "lib/module/index.js", diff --git a/sample/package.json b/sample/package.json index 8ddd34c..657b857 100644 --- a/sample/package.json +++ b/sample/package.json @@ -19,6 +19,7 @@ "@react-native-community/cli-platform-android": "^11.3.2", "@types/react-native-document-picker": "^3.1.1", "babel-plugin-module-resolver": "^4.1.0", - "metro-react-native-babel-preset": "^0.71.1" + "metro-react-native-babel-preset": "^0.71.1", + "react-native-modal": "^13.0.1" } } diff --git a/sample/yarn.lock b/sample/yarn.lock index b729ec7..6a9054d 100644 --- a/sample/yarn.lock +++ b/sample/yarn.lock @@ -3631,7 +3631,7 @@ prompts@^2.4.0: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@^15.7.2: +prop-types@^15.6.2, prop-types@^15.7.2: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -3671,6 +3671,13 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +react-native-animatable@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/react-native-animatable/-/react-native-animatable-1.3.3.tgz#a13a4af8258e3bb14d0a9d839917e9bb9274ec8a" + integrity sha512-2ckIxZQAsvWn25Ho+DK3d1mXIgj7tITkrS4pYDvx96WyOttSvzzFeQnM2od0+FUMzILbdHDsDEqZvnz1DYNQ1w== + dependencies: + prop-types "^15.7.2" + react-native-codegen@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.6.tgz#b3173faa879cf71bfade8d030f9c4698388f6909" @@ -3694,6 +3701,14 @@ react-native-document-picker@^8.1.1: dependencies: invariant "^2.2.4" +react-native-modal@^13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/react-native-modal/-/react-native-modal-13.0.1.tgz#691f1e646abb96fa82c1788bf18a16d585da37cd" + integrity sha512-UB+mjmUtf+miaG/sDhOikRfBOv0gJdBU2ZE1HtFWp6UixW9jCk/bhGdHUgmZljbPpp0RaO/6YiMmQSSK3kkMaw== + dependencies: + prop-types "^15.6.2" + react-native-animatable "1.3.3" + react-native@0.64.1: version "0.64.1" resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.64.1.tgz#cd38f5b47b085549686f34eb0c9dcd466f307635"