Skip to content

Commit

Permalink
Upgrade React Native 0.69.0-rc.0 to 0.69.0-rc.1 (#610)
Browse files Browse the repository at this point in the history
* Update react-native monorepo

* Upgrade to RN pods from 0.69.0-rc0 to rc1

* Revert Windows NDK 23 bump

Ref: facebook/react-native#33784

* Update Xcode config diffs

Ref: facebook/react-native@6efb517 (pbxproj)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: LeoTM <1881059+leotm@users.noreply.github.com>
  • Loading branch information
3 people authored May 13, 2022
1 parent 8ebc3d1 commit a48a9ff
Show file tree
Hide file tree
Showing 22 changed files with 639 additions and 736 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 0 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ buildscript {
if (System.properties['os.arch'] == "aarch64") {
// For M1 Users we need to use the NDK 24+ which added support for aarch64
ndkVersion = "25.0.8528842" // rc4
} else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
// For Android Users, we need to use NDK 23, otherwise the build will
// fail due to paths longer than the OS limit
ndkVersion = "23.1.7779620"
} else {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
Expand Down
2 changes: 0 additions & 2 deletions ios/MyApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,6 @@
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
};
name = Debug;
Expand Down Expand Up @@ -681,7 +680,6 @@
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
};
Expand Down
13 changes: 0 additions & 13 deletions ios/MyApp.xcworkspace/contents.xcworkspacedata

This file was deleted.

Loading

0 comments on commit a48a9ff

Please sign in to comment.