Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[WIP] React native upgrade from version 0.63.3 to 0.71.4 ? #15203

Closed
wants to merge 10 commits into from
Closed

[WIP] React native upgrade from version 0.63.3 to 0.71.4 ? #15203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0139bcb
react-native v0.63.3 -> v0.68.5 [IOS]
siddarthkay Jan 17, 2023
e415d36
react-native v0.63.3 -> v0.68.5 [Android]
siddarthkay Jan 4, 2023
e5a25aa
ios - specific fixes
siddarthkay Feb 27, 2023
b09642a
android - specific fixes
jakubgs Feb 28, 2023
ac0a441
CI - ios debugging
siddarthkay Mar 9, 2023
ec2ad13
(0.69.8) - RN IOS Upgrade
siddarthkay Mar 17, 2023
a45748a
(0.71.4) RN IOS Upgrade
siddarthkay Mar 9, 2023
58c6c2c
(0.71.4) RN Android Upgrade
siddarthkay Mar 20, 2023
8439c20
(0.71.4) Android - fixes
siddarthkay Mar 20, 2023
3f61907
(0.71.4) IOS Fixes
siddarthkay Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 0 additions & 97 deletions .flowconfig
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ local.properties
.vscode/
workspace.code-workspace

*.hprof

# node.js
#
node_modules/
Expand Down
2 changes: 2 additions & 0 deletions .prettierrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@ module.exports = {
bracketSameLine: true,
singleQuote: true,
trailingComma: 'all',
arrowParens: 'avoid',
tabWidth: 4,
arrowParens: 'avoid',
};
32 changes: 27 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ watchman-clean: ##@prepare Delete repo directory from watchman

pod-install: export TARGET := ios
pod-install: ##@prepare Run 'pod install' to install podfiles and update Podfile.lock
cd ios && pod install; cd --
cd ios && pod deintegrate && pod install; cd --

update-fleets: ##@prepare Download up-to-date JSON file with current fleets state
curl -s https://fleets.status.im/ \
Expand Down Expand Up @@ -186,10 +186,15 @@ ifndef APK
endif
scripts/fdroid-pr.sh "$(APK)"

xcode-clean: SHELL := /bin/sh
xcode-clean: XCODE_HOME := $(HOME)/Library/Developer/Xcode
xcode-clean: ##@prepare Clean XCode derived data and archives
rm -fr $(XCODE_HOME)/DerivedData/StatusIm-* $(XCODE_HOME)/Archives/*/StatusIm*

xcode-clean-workspace: SHELL := /bin/sh
xcode-clean-workspace: ##@prepare Use Xcode to clean workspace
xcodebuild clean -workspace ios/StatusIm.xcworkspace -scheme StatusImPR

xcode-clean-derived-data: SHELL := /bin/sh
xcode-clean-derived-data: XCODE_HOME := $(HOME)/Library/Developer/Xcode
xcode-clean-derived-data: ##@prepare Clean XCode derived data and archives
rm -fr $(XCODE_HOME)/DerivedData $(XCODE_HOME)/Archives/*/StatusIm*

#----------------
# Release builds
Expand Down Expand Up @@ -223,6 +228,23 @@ release-ios: watchman-clean ##@build Build release for iOS release
$(MAKE) jsbundle-ios && \
xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean archive

release-ios-pr: export TARGET := ios
release-ios-pr: export BUILD_ENV ?= prod
release-ios-pr: watchman-clean ##@build Build release for iOS PR release
@git clean -dxf -f target/ios && \
$(MAKE) jsbundle-ios && \
xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusImPR -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean archive

build-ios-pr: export TARGET := ios
build-ios-pr: export BUILD_ENV ?= prod
build-ios-pr: watchman-clean ##@build Build IOS StatusImPR
xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusImPR -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean build -verbose

build-ios: export TARGET := ios
build-ios: export BUILD_ENV ?= prod
build-ios: watchman-clean ##@build Build IOS StatusIm
xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean build -verbose

jsbundle-android: SHELL := /bin/sh
jsbundle-android: export TARGET := android
jsbundle-android: export BUILD_ENV ?= prod
Expand Down
Loading