-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[CHORE] Update to react-native 0.60.4 #1095
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # app/views/ShareListView/index.js # ios/Podfile # ios/Podfile.lock # ios/Pods/Manifest.lock # ios/Pods/Pods.xcodeproj/project.pbxproj # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.debug.xcconfig # ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.markdown # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig # ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig # ios/Pods/Target Support Files/react-native-realm-path/react-native-realm-path.xcconfig # ios/Pods/Target Support Files/rn-extensions-share/rn-extensions-share.xcconfig # ios/RocketChatRN.xcodeproj/project.pbxproj # package.json
djorkaeffalexandre
previously approved these changes
Aug 1, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGFM
djorkaeffalexandre
approved these changes
Aug 1, 2019
android/app/src/main/java/chat/rocket/reactnative/MainActivity.java
Outdated
Show resolved
Hide resolved
88abe2a
to
73f91ba
Compare
c68a59c
to
4740d86
Compare
….7.0 react-dom@16.8.6
djorkaeffalexandre
pushed a commit
that referenced
this pull request
Aug 9, 2019
* Update to 0.59.10 * stash * stash * patch RN * Try to fix openURL * Fix compile Share Extension * Minor fixes * build ios * tracking view working and added postinstall * SafeAreaView vertical never * tracking view patch * Android build working * Android notifications working * Lint and tests * Fix android build * Add tools:replace="android:appComponentFactory" * Android build * Update vector icons * Update webview * Remove jsc * Update document picker * Firebase * jetify on postinstall * Patch expo-haptics * CI * Migrate packages manually * Disable ci cache * Revert "Disable ci cache" This reverts commit 4740d86. * CI * audio * adapter * notifications * Try RN directly * Fix gradle * Revert patches * Restore cache * update redux and lodash * eslint-config-airbnb@17.1.1 eslint-plugin-jsx-a11y@6.2.3 * ejson@2.2.0 react-native-webview@6.7.0 semver@6.3.0 snyk@1.210.0 * codecov@3.5.0 eslint-plugin-react@7.14.3 eslint-plugin-react-native@3.7.0 react-dom@16.8.6 * Update react-redux and remove decorators * Update redux-saga and reactotron libs * Husky * Storybook libs * react-native-webview@6.8.0 markdown-it-flowdock@0.3.8 react-native-unimodules@0.5.3 * Removed regenerator-runtime * react-native-picker-select * react-navigation-header-buttons * Remove comments * react-native-notifications * Fix rnn android build
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@RocketChat/ReactNative
Update RN and other libs.