From ada2aed90b0352a9f7693d488d9d0f0206014300 Mon Sep 17 00:00:00 2001 From: Alex Junior Date: Wed, 6 Oct 2021 17:35:19 -0300 Subject: [PATCH] Chore: Update Android SDK TARGET to 30 (#3363) --- android/app/build.gradle | 2 ++ android/app/src/main/AndroidManifest.xml | 1 - android/build.gradle | 8 ++++---- ios/Podfile.lock | 10 +++++----- patches/react-native-image-crop-picker+0.31.1.patch | 12 ------------ yarn.lock | 4 ++-- 6 files changed, 13 insertions(+), 24 deletions(-) delete mode 100644 patches/react-native-image-crop-picker+0.31.1.patch diff --git a/android/app/build.gradle b/android/app/build.gradle index 42a73ea3b..c0cf8c961 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -292,6 +292,8 @@ dependencies { implementation "com.github.bumptech.glide:glide:4.9.0" annotationProcessor "com.github.bumptech.glide:compiler:4.9.0" implementation "com.tencent:mmkv-static:1.2.1" + implementation 'com.squareup.okhttp3:okhttp:4.9.0' + implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.0" } // Run this once to be able to run the application with BUCK diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7fa01e3f4..b5b6ec2c1 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -3,7 +3,6 @@ package="chat.rocket.reactnative"> - afterEvaluate { if ((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) { android { - compileSdkVersion 29 + compileSdkVersion 30 buildToolsVersion "29.0.3" defaultConfig { - targetSdkVersion 29 + targetSdkVersion 30 } variantFilter { variant -> def names = variant.flavors*.name diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 98abdd502..8b21c0edf 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -530,12 +530,12 @@ PODS: - RNFBApp - RNGestureHandler (1.10.3): - React-Core - - RNImageCropPicker (0.31.1): + - RNImageCropPicker (0.36.3): - React-Core - React-RCTImage - - RNImageCropPicker/QBImagePickerController (= 0.31.1) + - RNImageCropPicker/QBImagePickerController (= 0.36.3) - TOCropViewController - - RNImageCropPicker/QBImagePickerController (0.31.1): + - RNImageCropPicker/QBImagePickerController (0.36.3): - React-Core - React-RCTImage - TOCropViewController @@ -977,7 +977,7 @@ SPEC CHECKSUMS: EXVideoThumbnails: cd257fc6e07884a704a5674d362a6410933acb68 EXWebBrowser: d37a5ffdea1b65947352bc001dd9f732463725d4 FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b - FBReactNativeSpec: b427d2f482828b9533661dbcf9edf846cb60dc7b + FBReactNativeSpec: 110d69378fce79af38271c39894b59fec7890221 Firebase: 919186c8e119dd9372a45fd1dd17a8a942bc1892 FirebaseAnalytics: 5fa308e1b13f838d0f6dc74719ac2a72e8c5afc4 FirebaseCore: 8cd4f8ea22075e0ee582849b1cf79d8816506085 @@ -1061,7 +1061,7 @@ SPEC CHECKSUMS: RNFBApp: 6fd8a7e757135d4168bf033a8812c241af7363a0 RNFBCrashlytics: 88de72c2476b5868a892d9523b89b86c527c540e RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 - RNImageCropPicker: 38865ab4af1b0b2146ad66061196bc0184946855 + RNImageCropPicker: 97289cd94fb01ab79db4e5c92938be4d0d63415d RNLocalize: 82a569022724d35461e2dc5b5d015a13c3ca995b RNReanimated: 241c586663f44f19a53883c63375fdd041253960 RNRootView: 895a4813dedeaca82db2fa868ca1c333d790e494 diff --git a/patches/react-native-image-crop-picker+0.31.1.patch b/patches/react-native-image-crop-picker+0.31.1.patch deleted file mode 100644 index 167e876ea..000000000 --- a/patches/react-native-image-crop-picker+0.31.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java b/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java -index 3500542..94e45b6 100644 ---- a/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java -+++ b/node_modules/react-native-image-crop-picker/android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java -@@ -584,6 +584,7 @@ class PickerModule extends ReactContextBaseJavaModule implements ActivityEventLi - image.putInt("height", options.outHeight); - image.putString("mime", options.outMimeType); - image.putInt("size", (int) new File(compressedImagePath).length()); -+ image.putString("filename", compressedImage.getName()); - image.putString("modificationDate", String.valueOf(modificationDate)); - - if (includeBase64) { diff --git a/yarn.lock b/yarn.lock index 011a14210..7f7a4a2bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13702,8 +13702,8 @@ react-native-gesture-handler@^1.10.3: prop-types "^15.7.2" react-native-image-crop-picker@RocketChat/react-native-image-crop-picker: - version "0.31.1" - resolved "https://codeload.github.com/RocketChat/react-native-image-crop-picker/tar.gz/db1040b57e8536bd64db699897361167009b359c" + version "0.36.3" + resolved "https://codeload.github.com/RocketChat/react-native-image-crop-picker/tar.gz/f347776247afb5cbd1400dde215689d7ca8fd6f2" react-native-image-progress@^1.1.1: version "1.1.1"