diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index 083038d23a9..b08c4d03bb3 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -32,3 +32,10 @@ # Hermes # -keep class com.facebook.hermes.unicode.** { *; } # -keep class com.facebook.jni.** { *; }# + +# :react-native-inappbrowser-reborn +-keepattributes *Annotation* +-keepclassmembers class ** { + @org.greenrobot.eventbus.Subscribe ; +} +-keep enum org.greenrobot.eventbus.ThreadMode { *; } diff --git a/android/build.gradle b/android/build.gradle index 53ad44e29a5..193a92eecca 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,6 +9,7 @@ buildscript { targetSdkVersion = 30 kotlin_version = "1.3.50" kotlinVersion = "$kotlin_version" + supportLibVersion = "28.0.0" } repositories { google() diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 131ff1e4eb9..b4ae457964a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -428,6 +428,8 @@ PODS: - React-Core - RNI18n (2.0.15): - React + - RNInAppBrowser (3.7.0): + - React-Core - RNKeychain (8.0.0): - React-Core - RNOS (1.2.6): @@ -570,6 +572,7 @@ DEPENDENCIES: - RNFS (from `../node_modules/react-native-fs`) - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - RNI18n (from `../node_modules/react-native-i18n`) + - RNInAppBrowser (from `../node_modules/react-native-inappbrowser-reborn`) - RNKeychain (from `../node_modules/react-native-keychain`) - RNOS (from `../node_modules/react-native-os`) - RNReanimated (from `../node_modules/react-native-reanimated`) @@ -725,6 +728,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-gesture-handler" RNI18n: :path: "../node_modules/react-native-i18n" + RNInAppBrowser: + :path: "../node_modules/react-native-inappbrowser-reborn" RNKeychain: :path: "../node_modules/react-native-keychain" RNOS: @@ -825,6 +830,7 @@ SPEC CHECKSUMS: RNFS: 3ab21fa6c56d65566d1fb26c2228e2b6132e5e32 RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 RNI18n: e2f7e76389fcc6e84f2c8733ea89b92502351fd8 + RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364 RNKeychain: 4f63aada75ebafd26f4bc2c670199461eab85d94 RNOS: 6f2f9a70895bbbfbdad7196abd952e7b01d45027 RNReanimated: b04ef2a4f0cb61b062bbcf033f84a9e470f4f60b diff --git a/package.json b/package.json index 79aff1b730c..c7b111e2167 100644 --- a/package.json +++ b/package.json @@ -210,6 +210,7 @@ "react-native-gesture-handler": "^1.10.3", "react-native-i18n": "2.0.15", "react-native-in-app-review": "^3.2.3", + "react-native-inappbrowser-reborn": "^3.7.0", "react-native-jazzicon": "^0.1.2", "react-native-keyboard-aware-scroll-view": "^0.9.5", "react-native-keychain": "^8.0.0", @@ -421,7 +422,8 @@ "core-js": false, "sharp": true, "highlight.js": false, - "es5-ext": false + "es5-ext": false, + "react-native-inappbrowser-reborn": false } } } diff --git a/yarn.lock b/yarn.lock index 4d9579056a7..85c7d35f436 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13474,6 +13474,11 @@ open@^7.4.2: is-docker "^2.0.0" is-wsl "^2.1.1" +opencollective-postinstall@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" + integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== + opn@^5.4.0: version "5.5.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" @@ -14740,6 +14745,14 @@ react-native-in-app-review@^3.2.3: resolved "https://registry.yarnpkg.com/react-native-in-app-review/-/react-native-in-app-review-3.2.3.tgz#d61bfa14d33fc2a7f1ff85cea64e2a042ebdf299" integrity sha512-BTYTSp7Cf9rkcb210F76sxrEZSq5V+qx3auJ60XJ0FWrJiDLVH9QxRbDaS/c4OcAyjA45oKR6Rh1n2kmylWU7A== +react-native-inappbrowser-reborn@^3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/react-native-inappbrowser-reborn/-/react-native-inappbrowser-reborn-3.7.0.tgz#849a43c3c7da22b65147649fe596836bcb494083" + integrity sha512-Ia53jYNtFcbNaX5W3QfOmN25I7bcvuDiQmSY5zABXjy4+WI20bPc9ua09li55F8yDCjv3C99jX6vKms68mBV7g== + dependencies: + invariant "^2.2.4" + opencollective-postinstall "^2.0.3" + react-native-iphone-x-helper@^1.0.3, react-native-iphone-x-helper@^1.2.0, react-native-iphone-x-helper@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010"