Unverified Commit 8f5381d7 authored by Diego Mello's avatar Diego Mello Committed by GitHub
Browse files

Update React Native to 0.58.6 (#668)

parent 1f3ef392
......@@ -90,7 +90,7 @@ jobs:
android-build:
<<: *defaults
docker:
- image: circleci/android:api-27-node8-alpha
- image: circleci/android:api-28-node8-alpha
environment:
# GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError"
......@@ -201,13 +201,13 @@ jobs:
command: |
yarn
- run:
name: Fix known build error
command: |
# Fix error https://github.com/facebook/react-native/issues/14382
cd node_modules/react-native/scripts/
curl https://raw.githubusercontent.com/facebook/react-native/5c53f89dd86160301feee024bce4ce0c89e8c187/scripts/ios-configure-glog.sh > ios-configure-glog.sh
chmod +x ios-configure-glog.sh
# - run:
# name: Fix known build error
# command: |
# # Fix error https://github.com/facebook/react-native/issues/14382
# cd node_modules/react-native/scripts/
# curl https://raw.githubusercontent.com/facebook/react-native/5c53f89dd86160301feee024bce4ce0c89e8c187/scripts/ios-configure-glog.sh > ios-configure-glog.sh
# chmod +x ios-configure-glog.sh
- run:
name: Fastlane Build
......
export default () => 'Video';
export default () => 'View';
export default () => 'Video';
export default () => 'View';
......@@ -6661,7 +6661,7 @@ exports[`Storyshots Message list 1`] = `
}
swipeThreshold={100}
>
Video
View
</View>
</Modal>
</View>
......@@ -6849,7 +6849,7 @@ exports[`Storyshots Message list 1`] = `
}
}
>
Video
View
View
<View
animateTransitions={true}
......
......@@ -94,19 +94,19 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false
android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
compileSdkVersion 28
buildToolsVersion "28.0.3"
defaultConfig {
applicationId "chat.rocket.reactnative"
minSdkVersion 21
targetSdkVersion 27
targetSdkVersion 28
versionCode VERSIONCODE as Integer
versionName "1.10.0"
ndk {
abiFilters "armeabi-v7a", "x86"
}
missingDimensionStrategy "RNN.reactNativeVersion", "reactNative57"
missingDimensionStrategy "RNN.reactNativeVersion", "reactNative57_5"
vectorDrawables.useSupportLibrary = true
multiDexEnabled true
}
......@@ -116,6 +116,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
packagingOptions {
pickFirst '**/libjsc.so'
}
signingConfigs {
release {
if (project.hasProperty('KEYSTORE')) {
......@@ -185,7 +189,7 @@ repositories {
configurations.all {
resolutionStrategy {
force 'org.webkit:android-jsc:r236355'
force 'org.webkit:android-jsc:r225067'
}
}
......
......@@ -41,14 +41,14 @@ subprojects { subproject ->
afterEvaluate {
if ((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
compileSdkVersion 28
buildToolsVersion "28.0.3"
defaultConfig {
targetSdkVersion 27
targetSdkVersion 28
}
variantFilter { variant ->
def names = variant.flavors*.name
if (names.contains("reactNative51") || names.contains("reactNative55") || names.contains("reactNative56") || names.contains("reactNative57WixFork")) {
if (names.contains("reactNative51") || names.contains("reactNative55") || names.contains("reactNative56") || names.contains("reactNative57") || names.contains("reactNative57WixFork")) {
setIgnore(true)
}
}
......
......@@ -16,6 +16,6 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.enableAapt2=false
# android.enableAapt2=false
android.useDeprecatedNdk=true
VERSIONCODE=999999999
......@@ -147,6 +147,14 @@ export default class Message extends PureComponent {
KeyboardUtils.dismiss();
}
onLongPress = () => {
const { archived, onLongPress } = this.props;
if (this.isInfoMessage() || this.hasError() || archived) {
return;
}
onLongPress();
}
isInfoMessage = () => {
const { type } = this.props;
return SYSTEM_MESSAGES.includes(type);
......@@ -345,16 +353,15 @@ export default class Message extends PureComponent {
render() {
const {
editing, style, header, archived, onLongPress, reactionsModal, closeReactions, msg, ts, reactions, author, user, timeFormat, customEmojis, baseUrl
editing, style, header, reactionsModal, closeReactions, msg, ts, reactions, author, user, timeFormat, customEmojis, baseUrl
} = this.props;
const accessibilityLabel = I18n.t('Message_accessibility', { user: author.username, time: moment(ts).format(timeFormat), message: msg });
const disabled = this.isInfoMessage() || this.hasError() || archived;
return (
<View style={styles.root}>
{this.renderError()}
<TouchableWithoutFeedback
onLongPress={!disabled && onLongPress}
onLongPress={this.onLongPress}
onPress={this.onPress}
>
<View
......
......@@ -2,7 +2,7 @@ const random = require('./helpers/random');
const value = random(20);
const data = {
server: 'http://localhost:3000',
alternateServer: 'https://unstable.rocket.chat',
alternateServer: 'https://stable.rocket.chat',
user: `user${ value }`,
password: `password${ value }`,
alternateUser: 'detoxrn',
......
PODS:
- QBImagePickerController (3.4.0)
- React (0.57.8):
- React/Core (= 0.57.8)
- React/Core (0.57.8):
- yoga (= 0.57.8.React)
- React/fishhook (0.57.8)
- React/RCTActionSheet (0.57.8):
- React (0.58.6):
- React/Core (= 0.58.6)
- React/Core (0.58.6):
- yoga (= 0.58.6.React)
- React/fishhook (0.58.6)
- React/RCTActionSheet (0.58.6):
- React/Core
- React/RCTAnimation (0.57.8):
- React/RCTAnimation (0.58.6):
- React/Core
- React/RCTBlob (0.57.8):
- React/RCTBlob (0.58.6):
- React/Core
- React/RCTGeolocation (0.57.8):
- React/RCTGeolocation (0.58.6):
- React/Core
- React/RCTImage (0.57.8):
- React/RCTImage (0.58.6):
- React/Core
- React/RCTNetwork
- React/RCTLinkingIOS (0.57.8):
- React/RCTLinkingIOS (0.58.6):
- React/Core
- React/RCTNetwork (0.57.8):
- React/RCTNetwork (0.58.6):
- React/Core
- React/RCTSettings (0.57.8):
- React/RCTSettings (0.58.6):
- React/Core
- React/RCTText (0.57.8):
- React/RCTText (0.58.6):
- React/Core
- React/RCTVibration (0.57.8):
- React/RCTVibration (0.58.6):
- React/Core
- React/RCTWebSocket (0.57.8):
- React/RCTWebSocket (0.58.6):
- React/Core
- React/fishhook
- React/RCTBlob
......@@ -37,7 +37,7 @@ PODS:
- React/Core
- RSKImageCropper
- RSKImageCropper (2.2.1)
- yoga (0.57.8.React)
- yoga (0.58.6.React)
DEPENDENCIES:
- React/Core (from `../node_modules/react-native`)
......@@ -55,24 +55,29 @@ DEPENDENCIES:
- RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
- yoga (from `../node_modules/react-native/ReactCommon/yoga/yoga.podspec`)
SPEC REPOS:
https://github.com/cocoapods/specs.git:
- QBImagePickerController
- RSKImageCropper
EXTERNAL SOURCES:
React:
:path: ../node_modules/react-native
:path: "../node_modules/react-native"
RNDeviceInfo:
:path: ../node_modules/react-native-device-info
:path: "../node_modules/react-native-device-info"
RNImageCropPicker:
:path: ../node_modules/react-native-image-crop-picker
:path: "../node_modules/react-native-image-crop-picker"
yoga:
:path: ../node_modules/react-native/ReactCommon/yoga/yoga.podspec
:path: "../node_modules/react-native/ReactCommon/yoga/yoga.podspec"
SPEC CHECKSUMS:
QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022
React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
RNDeviceInfo: 568c5641057313b4912d08a7742ff0b2f753ed5c
RNImageCropPicker: 32ca4b9fef4e1b7b85ba69494242122948117e06
React: 130b87b2d5e2baac646954282cab87be986d98fc
RNDeviceInfo: e7c5fcde13d40e161d8a27f6c5dc69c638936002
RNImageCropPicker: e608efe182652dc8690268cb99cb5a201f2b5ea3
RSKImageCropper: 98296ad26b41753f796b6898d015509598f13d97
yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
yoga: 32d7ef1081951e9a35a4c72a7be797598b138a48
PODFILE CHECKSUM: da5e520837501713de2c32adbff219ab7fc5c0fa
COCOAPODS: 1.4.0
COCOAPODS: 1.6.0
../../../../../../node_modules/react-native/React/Base/RCTJSCErrorHandling.h
\ No newline at end of file
../../../../../../node_modules/react-native/React/Modules/RCTJSCSamplingProfiler.h
\ No newline at end of file
../../../../../../node_modules/react-native/React/Views/RCTNavItem.h
\ No newline at end of file
../../../../../../node_modules/react-native/React/Views/RCTNavItemManager.h
\ No newline at end of file
../../../../../../node_modules/react-native/React/Views/RCTNavigator.h
\ No newline at end of file
../../../../../../node_modules/react-native/React/Views/RCTNavigatorManager.h
\ No newline at end of file
../../../../../../node_modules/react-native/React/Base/RCTJSCErrorHandling.h
\ No newline at end of file
../../../../../../node_modules/react-native/React/Modules/RCTJSCSamplingProfiler.h
\ No newline at end of file
../../../../../../node_modules/react-native/React/Views/RCTNavItem.h
\ No newline at end of file
../../../../../../node_modules/react-native/React/Views/RCTNavItemManager.h
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment