-
Notifications
You must be signed in to change notification settings - Fork 1.4k
feat: Upgrade to React Native 0.72.3 #5128
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
Closed
Closed
Changes from all commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
cf897a5
iOS building
diegolmello 344c6e4
Trying to build android
diegolmello 9665a04
Use react-native-scrollable-tab-view fork
diegolmello 9ac17ea
Bump kotlin version and use fixed gradle version
diegolmello 471bd90
Update cameraroll
diegolmello ee04ff7
Remove SSLPinning
diegolmello 86242c1
Lint and unit tests
diegolmello 5005b40
react-native-scrollable-tab-view patch
diegolmello 71dafd3
Bump ndk version
diegolmello 72fa2ea
Install ninja-build
diegolmello 74e9e50
Remove android-env and bash-env
diegolmello 1d99145
Temp use android-machine
diegolmello 28d55a5
Migrate NavBottomFAB to reanimated 3
diegolmello df65ded
Fix bugsnag on Android
diegolmello d5008e9
Refactor android-executor
diegolmello 299c0b6
Revert scrollable fork
diegolmello f38c981
Challenge extension on iOS
diegolmello 36cb62a
Refactor
diegolmello fe5e491
Swizzle kinda working?
diegolmello a3a59e1
Fix Reactotron socket
diegolmello 0afb6d7
Cleanup
diegolmello e41448c
RCTHTTPRequestHandler+Challenge -> SSLPinning
diegolmello 0986715
SSL Pinning working on Android
diegolmello 6702138
Missing patches for ssl pinning
diegolmello b6156a2
Remove Android share extension patch
diegolmello 189dcc7
Fix RN patch
diegolmello dcb35ae
RN 0.72.3
diegolmello 502a5a2
Fix share extension pods
diegolmello 4ada24b
Fix WebSocket patch
diegolmello ded039d
yarn cache
diegolmello 8451cc7
Fix e2e tests mock
diegolmello 1047d4b
Try a fix for android build
diegolmello 7dc76b3
Cleanup
diegolmello b4dbb42
Production Expo
diegolmello e6130c3
Android build stacktrace
diegolmello 72c69b2
Permission
diegolmello 43a131f
--debug
diegolmello 60a8108
Ignore cache
diegolmello 47f4567
Reset gradle cache
diegolmello 7733eb3
Revert CI workflow
diegolmello 5eeb7ac
Stop restoring gradle from cache
diegolmello 819203a
Cleanup
diegolmello a651b74
Update .circleci/config.yml
diegolmello 47dc818
Update .circleci/config.yml
diegolmello 674c4d9
Bump react-native-reanimated to 3.4.1
diegolmello 9f93bc3
Patch-package for react-native-reanimated https://github.com/software…
diegolmello 0813eb9
Fix ts issues
diegolmello File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,13 @@ defaults: &defaults | |
|
|
||
| android-img: &android-img | ||
| docker: | ||
| - image: cimg/android:2023.04.1-node | ||
| - image: cimg/android:2023.06.1-node | ||
|
|
||
| android-executor: &android-executor | ||
| executor: | ||
| name: android/android-machine | ||
| resource-class: xlarge | ||
| tag: 2023.06.1 | ||
|
|
||
| orbs: | ||
| android: circleci/[email protected] | ||
|
|
@@ -103,13 +109,10 @@ commands: | |
| description: "Build Android app" | ||
| steps: | ||
| - checkout | ||
|
|
||
| - restore_cache: *restore-npm-cache-linux | ||
|
|
||
| - run: *install-npm-modules | ||
|
|
||
| - restore_cache: *restore-gradle-cache | ||
|
|
||
| - save_cache: *save-npm-cache-linux | ||
| # - restore_cache: *restore-gradle-cache | ||
| - run: | ||
| name: Configure Gradle | ||
| command: | | ||
|
|
@@ -139,20 +142,17 @@ commands: | |
| echo -e "KEY_PASSWORD=$KEYSTORE_EXPERIMENTAL_PASSWORD" >> ./gradle.properties | ||
| fi | ||
| working_directory: android | ||
|
|
||
| - run: | ||
| name: Set Google Services | ||
| command: | | ||
| if [[ $GOOGLE_SERVICES_ANDROID ]]; then | ||
| echo $GOOGLE_SERVICES_ANDROID | base64 --decode > google-services.json | ||
| fi | ||
| working_directory: android/app | ||
|
|
||
| - run: | ||
| name: Build App | ||
| no_output_timeout: 40m | ||
| command: | | ||
| sudo apt install -y libicu-dev | ||
| if [[ $CIRCLE_JOB == "android-build-official" ]]; then | ||
| ./gradlew bundleOfficialPlayRelease | ||
| fi | ||
|
|
@@ -163,7 +163,6 @@ commands: | |
| ./gradlew assembleExperimentalPlayDebug | ||
| fi | ||
| working_directory: android | ||
|
|
||
| - run: | ||
| name: Upload sourcemaps to Bugsnag | ||
| command: | | ||
|
|
@@ -173,24 +172,19 @@ commands: | |
| --app-version-code=$CIRCLE_BUILD_NUM \ | ||
| --platform android \ | ||
| --source-map=android/app/build/generated/sourcemaps/react/officialPlayRelease/index.android.bundle.map \ | ||
| --bundle android/app/build/ASSETS/createBundleOfficialPlayReleaseJsAndAssets/index.android.bundle | ||
| --bundle android/app/build/generated/assets/createBundleOfficialPlayReleaseJsAndAssets/index.android.bundle | ||
| fi | ||
| if [[ $CIRCLE_JOB == "android-build-experimental" || "android-automatic-build-experimental" ]]; then | ||
| npx bugsnag-source-maps upload-react-native \ | ||
| --api-key=$BUGSNAG_KEY \ | ||
| --app-version-code=$CIRCLE_BUILD_NUM \ | ||
| --platform android \ | ||
| --source-map=android/app/build/generated/sourcemaps/react/experimentalPlayRelease/index.android.bundle.map \ | ||
| --bundle android/app/build/ASSETS/createBundleExperimentalPlayReleaseJsAndAssets/index.android.bundle | ||
| --bundle android/app/build/generated/assets/createBundleExperimentalPlayReleaseJsAndAssets/index.android.bundle | ||
| fi | ||
|
|
||
| - store_artifacts: | ||
| path: android/app/build/outputs | ||
|
|
||
| - save_cache: *save-npm-cache-linux | ||
|
|
||
| - save_cache: *save-gradle-cache | ||
|
|
||
| - persist_to_workspace: | ||
| root: . | ||
| paths: | ||
|
|
@@ -389,32 +383,29 @@ jobs: | |
| # Android builds | ||
| android-build-experimental: | ||
| <<: *defaults | ||
| <<: *android-img | ||
| <<: *android-executor | ||
| environment: | ||
| <<: *android-env | ||
| <<: *bash-env | ||
| resource_class: xlarge | ||
| steps: | ||
| - android-build | ||
|
|
||
| # Android automatic builds | ||
| android-automatic-build-experimental: | ||
| <<: *defaults | ||
| <<: *android-img | ||
| <<: *android-executor | ||
| environment: | ||
| <<: *android-env | ||
| <<: *bash-env | ||
| resource_class: xlarge | ||
| steps: | ||
| - android-build | ||
|
|
||
| android-build-official: | ||
| <<: *defaults | ||
| <<: *android-img | ||
| <<: *android-executor | ||
| environment: | ||
| <<: *android-env | ||
| <<: *bash-env | ||
| resource_class: xlarge | ||
| steps: | ||
| - android-build | ||
|
|
||
|
|
@@ -449,10 +440,7 @@ jobs: | |
|
|
||
| e2e-build-android: | ||
| <<: *defaults | ||
| executor: | ||
| name: android/android-machine | ||
| resource-class: xlarge | ||
| tag: 2023.04.1 | ||
| <<: *android-executor | ||
| environment: | ||
| <<: *android-env | ||
| steps: | ||
|
|
@@ -465,7 +453,6 @@ jobs: | |
| name: Configure Gradle | ||
| command: | | ||
| echo -e "" > ./gradle.properties | ||
| # echo -e "android.enableAapt2=false" >> ./gradle.properties | ||
| echo -e "android.useAndroidX=true" >> ./gradle.properties | ||
| echo -e "android.enableJetifier=true" >> ./gradle.properties | ||
| echo -e "newArchEnabled=false" >> ./gradle.properties | ||
|
|
@@ -498,10 +485,7 @@ jobs: | |
|
|
||
| e2e-test-android: | ||
| <<: *defaults | ||
| executor: | ||
| name: android/android-machine | ||
| resource-class: xlarge | ||
| tag: 2023.04.1 | ||
| <<: *android-executor | ||
| parallelism: 4 | ||
| steps: | ||
| - checkout | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
12 changes: 6 additions & 6 deletions
12
__tests__/containers/Button/__snapshots__/Button.stories.storyshot
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`Storyshots Button Custom Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"accessibilityValue\\":{},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"purple\\",\\"padding\\":10,\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"yellow\\",\\"fontSize\\":18},[{\\"textAlign\\":\\"left\\"}]],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`; | ||
| exports[`Storyshots Button Custom Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"accessibilityValue\\":{},\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"purple\\",\\"padding\\":10,\\"opacity\\":1},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"yellow\\",\\"fontSize\\":18},[{\\"textAlign\\":\\"left\\"}]],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`; | ||
|
|
||
| exports[`Storyshots Button Disabled Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"accessibilityValue\\":{},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":0.3}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#ffffff\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`; | ||
| exports[`Storyshots Button Disabled Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"accessibilityValue\\":{},\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":0.3},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#ffffff\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`; | ||
|
|
||
| exports[`Storyshots Button Disabled Loading Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"accessibilityValue\\":{},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":0.3}},\\"children\\":[{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":[{\\"padding\\":16,\\"flex\\":1},null],\\"color\\":\\"#ffffff\\"},\\"children\\":null}]}"`; | ||
| exports[`Storyshots Button Disabled Loading Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"accessibilityValue\\":{},\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":0.3},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":[{\\"padding\\":16,\\"flex\\":1},null],\\"color\\":\\"#ffffff\\"},\\"children\\":null}]}"`; | ||
|
|
||
| exports[`Storyshots Button Loading Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"accessibilityValue\\":{},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":[{\\"padding\\":16,\\"flex\\":1},null],\\"color\\":\\"#ffffff\\"},\\"children\\":null}]}"`; | ||
| exports[`Storyshots Button Loading Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":true},\\"accessibilityValue\\":{},\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":1},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"ActivityIndicator\\",\\"props\\":{\\"style\\":[{\\"padding\\":16,\\"flex\\":1},null],\\"color\\":\\"#ffffff\\"},\\"children\\":null}]}"`; | ||
|
|
||
| exports[`Storyshots Button Primary Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"accessibilityValue\\":{},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#ffffff\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`; | ||
| exports[`Storyshots Button Primary Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"accessibilityValue\\":{},\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#1d74f5\\",\\"opacity\\":1},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#ffffff\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`; | ||
|
|
||
| exports[`Storyshots Button Secondary Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"accessibilityValue\\":{},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false,\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#ffffff\\",\\"opacity\\":1}},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#2f343d\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`; | ||
| exports[`Storyshots Button Secondary Button 1`] = `"{\\"type\\":\\"View\\",\\"props\\":{\\"accessible\\":true,\\"accessibilityLabel\\":\\"Press me!\\",\\"accessibilityState\\":{\\"disabled\\":false},\\"accessibilityValue\\":{},\\"style\\":{\\"paddingHorizontal\\":14,\\"justifyContent\\":\\"center\\",\\"height\\":48,\\"borderRadius\\":4,\\"marginBottom\\":12,\\"backgroundColor\\":\\"#ffffff\\",\\"opacity\\":1},\\"testID\\":\\"testButton\\",\\"focusable\\":true,\\"collapsable\\":false},\\"children\\":[{\\"type\\":\\"Text\\",\\"props\\":{\\"style\\":[{\\"textAlign\\":\\"center\\",\\"backgroundColor\\":\\"transparent\\",\\"fontFamily\\":\\"Inter\\",\\"fontWeight\\":\\"500\\"},{\\"color\\":\\"#2f343d\\",\\"fontSize\\":16},null],\\"accessibilityLabel\\":\\"Press me!\\"},\\"children\\":[\\"Press me!\\"]}]}"`; |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Had to do it to build properly.
Removed here only, because e2e tests seems to work with it.
Probably because here it's bundling, while there it's assembling.
After we get rid of the RN Android fork, we might be able to enable it again.