Skip to content

Commit 907b35c

Browse files
rasomrasom
committed
Migrate to RN 0.61.5
This change allows to fix status bar on iOS in dark mode status-im#9470
1 parent f30f0ed commit 907b35c

13 files changed

Lines changed: 497 additions & 319 deletions

File tree

‎.flowconfig‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ node_modules/react-native/Libraries/polyfills/.*
3131
; require from fbjs/lib instead: require('fbjs/lib/warning')
3232
node_modules/warning/.*
3333
; Flow doesn't support platforms
34-
.*/Libraries/Utilities/HMRLoadingView.js
34+
.*/Libraries/Utilities/LoadingView.js
3535
[untyped]
3636
.*/node_modules/@react-native-community/cli/.*/.*
3737

@@ -75,7 +75,9 @@ experimental.strict_type_args=true
7575
munge_underscores=true
7676

7777
module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
78-
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
78+
module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
79+
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
80+
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
7981

8082
module.file_ext=.js
8183
module.file_ext=.jsx
@@ -92,4 +94,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*
9294
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
9395

9496
[version]
95-
^0.98.0
97+
^0.105.0

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ DerivedData
2525
*.ipa
2626
*.xcuserstate
2727
project.xcworkspace
28+
xcshareddata
2829

2930
# Android/IJ
3031
#
@@ -56,6 +57,7 @@ buck-out/
5657
android/app/libs
5758
android/app/obj
5859
android/keystores/debug.keystore
60+
!debug.keystore
5961

6062
# Generated by clj-rn
6163
#

‎android/app/build.gradle‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,7 @@ android {
200200
exclude '/lib/mips64/**'
201201
exclude '/lib/armeabi/**'
202202

203-
pickFirst '**/armeabi-v7a/libc++_shared.so'
204-
pickFirst '**/x86/libc++_shared.so'
205-
pickFirst '**/arm64-v8a/libc++_shared.so'
206-
pickFirst '**/x86_64/libc++_shared.so'
207-
pickFirst '**/x86/libjsc.so'
208-
pickFirst '**/armeabi-v7a/libjsc.so'
209-
203+
210204
/** Fix for: Execution failed for task ':app:transformNativeLibsWithStripDebugSymbolForDebug'.
211205
* with recent version of ndk (17.0.4754217)
212206
*/

‎clj-rn.conf.edn‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"bignumber.js"
99
"react-native-languages"
1010
"i18n-js"
11-
"dismissKeyboard"
1211
"react-native-splash-screen"
1312
"react-native-status"
1413
"react-native-status-keycard"

‎components/src/status_im/ui/components/react.cljs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
(def native-modules (.-NativeModules js-dependencies/react-native))
2727
(def device-event-emitter (.-DeviceEventEmitter js-dependencies/react-native))
2828

29-
(def dismiss-keyboard! js-dependencies/dismiss-keyboard)
30-
3129
(def splash-screen (.-SplashScreen native-modules))
3230

3331
;; React Components
@@ -42,6 +40,7 @@
4240
(def scroll-view-class (get-class "ScrollView"))
4341
(def keyboard-avoiding-view-class (get-class "KeyboardAvoidingView"))
4442

43+
4544
(def text-class (get-class "Text"))
4645
(def text-input-class (get-class "TextInput"))
4746
(def image-class (get-class "Image"))
@@ -87,6 +86,7 @@
8786

8887
(def dimensions (.-Dimensions js-dependencies/react-native))
8988
(def keyboard (.-Keyboard js-dependencies/react-native))
89+
(defn dismiss-keyboard! [] (.dismiss keyboard))
9090
(def linking (.-Linking js-dependencies/react-native))
9191
(def desktop-notification (.-DesktopNotification (.-NativeModules js-dependencies/react-native)))
9292

@@ -320,4 +320,4 @@
320320
view
321321
keyboard-avoiding-view)
322322
{:flex 1 :flex-direction :column}
323-
(apply vector view styles/flex components)]])
323+
(apply vector view styles/flex components)]])

‎externs.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ var TopLevel = {
5959
"confirmMessagesProcessed" : function () {},
6060
"messages": function() {},
6161
"discovery": function() {},
62+
"dismiss": function() {},
6263
"negotiated": function() {},
6364
"chatId": function() {},
6465
"confirmMessagesProcessedByID" : function () {},

‎figwheel-bridge.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ var config = {
1616
var React = require('react');
1717
var createReactClass = require('create-react-class');
1818
var ReactNative = require('react-native');
19-
var WebSocket = require('WebSocket');
2019
var self;
2120
var evaluate = eval; // This is needed, direct calls to eval does not work (RN packager???)
2221
var externalModules = {};

‎ios/Podfile‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,32 @@ target 'StatusIm' do
99
# use_frameworks!
1010
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
1111
# Pods for StatusIm
12+
pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
13+
pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
14+
pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
15+
pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
1216
pod 'React', :path => '../node_modules/react-native/'
13-
pod 'React-Core', :path => '../node_modules/react-native/React'
14-
pod 'React-DevSupport', :path => '../node_modules/react-native/React'
17+
pod 'React-Core', :path => '../node_modules/react-native/'
18+
pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
19+
pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
1520
pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
1621
pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
1722
pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
18-
# RCTImage is required by react-native-svg
1923
pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
2024
pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
2125
pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
2226
pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
2327
pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
2428
pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
25-
pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket'
29+
pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
2630

2731
pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
2832
pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
2933
pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
3034
pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
31-
pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
35+
pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
36+
pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
37+
pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
3238

3339
# when removing svg pod, RCTImage is needed to be removed from React subspecs
3440
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'

0 commit comments

Comments
 (0)