react-native 0.67.0-rc.5 → 0.67.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Libraries/Core/ReactNativeVersion.js +3 -3
- package/React/Base/RCTVersion.m +3 -3
- package/React/CoreModules/RCTAlertController.m +6 -0
- package/ReactAndroid/gradle.properties +2 -2
- package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java +7 -3
- package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java +3 -3
- package/ReactAndroid/src/main/third-party/java/okhttp/BUCK +4 -4
- package/ReactCommon/cxxreact/ReactNativeVersion.h +3 -3
- package/android/com/facebook/react/react-native/{0.67.0-rc.5/react-native-0.67.0-rc.5.aar → 0.67.2/react-native-0.67.2.aar} +0 -0
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.aar.md5 +1 -0
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.aar.sha1 +1 -0
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.aar.sha256 +1 -0
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.aar.sha512 +1 -0
- package/android/com/facebook/react/react-native/{0.67.0-rc.5/react-native-0.67.0-rc.5.module → 0.67.2/react-native-0.67.2.module} +19 -19
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.module.md5 +1 -0
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.module.sha1 +1 -0
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.module.sha256 +1 -0
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.module.sha512 +1 -0
- package/android/com/facebook/react/react-native/{0.67.0-rc.5/react-native-0.67.0-rc.5.pom → 0.67.2/react-native-0.67.2.pom} +3 -3
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.pom.md5 +1 -0
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.pom.sha1 +1 -0
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.pom.sha256 +1 -0
- package/android/com/facebook/react/react-native/0.67.2/react-native-0.67.2.pom.sha512 +1 -0
- package/android/com/facebook/react/react-native/maven-metadata.xml +4 -4
- package/android/com/facebook/react/react-native/maven-metadata.xml.md5 +1 -1
- package/android/com/facebook/react/react-native/maven-metadata.xml.sha1 +1 -1
- package/android/com/facebook/react/react-native/maven-metadata.xml.sha256 +1 -1
- package/android/com/facebook/react/react-native/maven-metadata.xml.sha512 +1 -1
- package/jest/mockModal.js +2 -2
- package/package.json +3 -2
- package/react.gradle +0 -4
- package/scripts/find-node.sh +6 -2
- package/scripts/react_native_pods.rb +4 -2
- package/template/Gemfile.lock +6 -6
- package/template/package.json +1 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.aar.md5 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.aar.sha1 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.aar.sha256 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.aar.sha512 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.module.md5 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.module.sha1 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.module.sha256 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.module.sha512 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.pom.md5 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.pom.sha1 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.pom.sha256 +0 -1
- package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.pom.sha512 +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @generated by scripts/
|
|
2
|
+
* @generated by scripts/set-rn-version.js
|
|
3
3
|
*
|
|
4
4
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
5
5
|
*
|
|
@@ -12,6 +12,6 @@
|
|
|
12
12
|
exports.version = {
|
|
13
13
|
major: 0,
|
|
14
14
|
minor: 67,
|
|
15
|
-
patch:
|
|
16
|
-
prerelease:
|
|
15
|
+
patch: 2,
|
|
16
|
+
prerelease: null,
|
|
17
17
|
};
|
package/React/Base/RCTVersion.m
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @generated by scripts/
|
|
2
|
+
* @generated by scripts/set-rn-version.js
|
|
3
3
|
*
|
|
4
4
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
5
5
|
*
|
|
@@ -23,8 +23,8 @@ NSDictionary* RCTGetReactNativeVersion(void)
|
|
|
23
23
|
__rnVersion = @{
|
|
24
24
|
RCTVersionMajor: @(0),
|
|
25
25
|
RCTVersionMinor: @(67),
|
|
26
|
-
RCTVersionPatch: @(
|
|
27
|
-
RCTVersionPrerelease:
|
|
26
|
+
RCTVersionPatch: @(2),
|
|
27
|
+
RCTVersionPrerelease: [NSNull null],
|
|
28
28
|
};
|
|
29
29
|
});
|
|
30
30
|
return __rnVersion;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
VERSION_NAME=0.67.
|
|
1
|
+
VERSION_NAME=0.67.2
|
|
2
2
|
GROUP=com.facebook.react
|
|
3
3
|
|
|
4
4
|
POM_NAME=ReactNative
|
|
@@ -12,7 +12,7 @@ JUNIT_VERSION=4.12
|
|
|
12
12
|
|
|
13
13
|
ANDROIDX_TEST_VERSION=1.1.0
|
|
14
14
|
FRESCO_VERSION=2.5.0
|
|
15
|
-
OKHTTP_VERSION=4.9.
|
|
15
|
+
OKHTTP_VERSION=4.9.2
|
|
16
16
|
SO_LOADER_VERSION=0.10.1
|
|
17
17
|
|
|
18
18
|
BOOST_VERSION=1_63_0
|
|
@@ -26,6 +26,7 @@ import android.view.Surface;
|
|
|
26
26
|
import android.view.View;
|
|
27
27
|
import android.view.ViewGroup;
|
|
28
28
|
import android.view.ViewTreeObserver;
|
|
29
|
+
import android.view.WindowInsets;
|
|
29
30
|
import android.view.WindowManager;
|
|
30
31
|
import android.widget.FrameLayout;
|
|
31
32
|
import androidx.annotation.Nullable;
|
|
@@ -775,9 +776,12 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
|
|
|
775
776
|
getRootView().getWindowVisibleDisplayFrame(mVisibleViewArea);
|
|
776
777
|
int notchHeight = 0;
|
|
777
778
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
|
|
778
|
-
|
|
779
|
-
if (
|
|
780
|
-
|
|
779
|
+
WindowInsets insets = getRootView().getRootWindowInsets();
|
|
780
|
+
if (insets != null) {
|
|
781
|
+
DisplayCutout displayCutout = insets.getDisplayCutout();
|
|
782
|
+
if (displayCutout != null) {
|
|
783
|
+
notchHeight = displayCutout.getSafeInsetTop();
|
|
784
|
+
}
|
|
781
785
|
}
|
|
782
786
|
}
|
|
783
787
|
final int heightDiff =
|
package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @generated by scripts/
|
|
2
|
+
* @generated by scripts/set-rn-version.js
|
|
3
3
|
*
|
|
4
4
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
5
5
|
*
|
|
@@ -17,6 +17,6 @@ public class ReactNativeVersion {
|
|
|
17
17
|
public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
|
|
18
18
|
"major", 0,
|
|
19
19
|
"minor", 67,
|
|
20
|
-
"patch",
|
|
21
|
-
"prerelease",
|
|
20
|
+
"patch", 2,
|
|
21
|
+
"prerelease", null);
|
|
22
22
|
}
|
|
@@ -30,8 +30,8 @@ rn_prebuilt_jar(
|
|
|
30
30
|
|
|
31
31
|
fb_native.remote_file(
|
|
32
32
|
name = "okhttp3-binary.jar",
|
|
33
|
-
sha1 = "
|
|
34
|
-
url = "mvn:com.squareup.okhttp3:okhttp:jar:4.9.
|
|
33
|
+
sha1 = "5302714ee9320b64cf65ed865e5f65981ef9ba46",
|
|
34
|
+
url = "mvn:com.squareup.okhttp3:okhttp:jar:4.9.2",
|
|
35
35
|
)
|
|
36
36
|
|
|
37
37
|
rn_prebuilt_jar(
|
|
@@ -41,6 +41,6 @@ rn_prebuilt_jar(
|
|
|
41
41
|
|
|
42
42
|
fb_native.remote_file(
|
|
43
43
|
name = "okhttp3-urlconnection-binary.jar",
|
|
44
|
-
sha1 = "
|
|
45
|
-
url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:4.9.
|
|
44
|
+
sha1 = "3b9e64d3d56370bc7488ed8b336d17a8013cb336",
|
|
45
|
+
url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:4.9.2",
|
|
46
46
|
)
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* This source code is licensed under the MIT license found in the
|
|
5
5
|
* LICENSE file in the root directory of this source tree.
|
|
6
6
|
*
|
|
7
|
-
* @generated by scripts/
|
|
7
|
+
* @generated by scripts/set-rn-version.js
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
10
|
#pragma once
|
|
@@ -17,8 +17,8 @@ namespace facebook::react {
|
|
|
17
17
|
constexpr struct {
|
|
18
18
|
int32_t Major = 0;
|
|
19
19
|
int32_t Minor = 67;
|
|
20
|
-
int32_t Patch =
|
|
21
|
-
std::string_view Prerelease = "
|
|
20
|
+
int32_t Patch = 2;
|
|
21
|
+
std::string_view Prerelease = "";
|
|
22
22
|
} ReactNativeVersion;
|
|
23
23
|
|
|
24
24
|
} // namespace facebook::react
|
|
Binary file
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
283c3ad2a09a9b26bcf8632c2d0cc7ab
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
6abbadc0b8174e42fb4f5d9f4a578deac714cc94
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
393697ad0a9bfe604f6f249cb23abc590b32ad3fb36cfc8c5d86327951b82fae
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
9fa54c888fd61fce49b65610c0eb3cd6795e5e31683105b3048a5b31c34f59dd749c48e55d5577ba45fcd624bb4041028071cde82a91208d402f9352a70337af
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"component": {
|
|
4
4
|
"group": "com.facebook.react",
|
|
5
5
|
"module": "react-native",
|
|
6
|
-
"version": "0.67.
|
|
6
|
+
"version": "0.67.2",
|
|
7
7
|
"attributes": {
|
|
8
8
|
"org.gradle.status": "release"
|
|
9
9
|
}
|
|
@@ -104,14 +104,14 @@
|
|
|
104
104
|
"group": "com.squareup.okhttp3",
|
|
105
105
|
"module": "okhttp",
|
|
106
106
|
"version": {
|
|
107
|
-
"requires": "4.9.
|
|
107
|
+
"requires": "4.9.2"
|
|
108
108
|
}
|
|
109
109
|
},
|
|
110
110
|
{
|
|
111
111
|
"group": "com.squareup.okhttp3",
|
|
112
112
|
"module": "okhttp-urlconnection",
|
|
113
113
|
"version": {
|
|
114
|
-
"requires": "4.9.
|
|
114
|
+
"requires": "4.9.2"
|
|
115
115
|
}
|
|
116
116
|
},
|
|
117
117
|
{
|
|
@@ -131,13 +131,13 @@
|
|
|
131
131
|
],
|
|
132
132
|
"files": [
|
|
133
133
|
{
|
|
134
|
-
"name": "react-native-0.67.
|
|
135
|
-
"url": "react-native-0.67.
|
|
136
|
-
"size":
|
|
137
|
-
"sha512": "
|
|
138
|
-
"sha256": "
|
|
139
|
-
"sha1": "
|
|
140
|
-
"md5": "
|
|
134
|
+
"name": "react-native-0.67.2.aar",
|
|
135
|
+
"url": "react-native-0.67.2.aar",
|
|
136
|
+
"size": 17805049,
|
|
137
|
+
"sha512": "9fa54c888fd61fce49b65610c0eb3cd6795e5e31683105b3048a5b31c34f59dd749c48e55d5577ba45fcd624bb4041028071cde82a91208d402f9352a70337af",
|
|
138
|
+
"sha256": "393697ad0a9bfe604f6f249cb23abc590b32ad3fb36cfc8c5d86327951b82fae",
|
|
139
|
+
"sha1": "6abbadc0b8174e42fb4f5d9f4a578deac714cc94",
|
|
140
|
+
"md5": "283c3ad2a09a9b26bcf8632c2d0cc7ab"
|
|
141
141
|
}
|
|
142
142
|
]
|
|
143
143
|
},
|
|
@@ -231,14 +231,14 @@
|
|
|
231
231
|
"group": "com.squareup.okhttp3",
|
|
232
232
|
"module": "okhttp",
|
|
233
233
|
"version": {
|
|
234
|
-
"requires": "4.9.
|
|
234
|
+
"requires": "4.9.2"
|
|
235
235
|
}
|
|
236
236
|
},
|
|
237
237
|
{
|
|
238
238
|
"group": "com.squareup.okhttp3",
|
|
239
239
|
"module": "okhttp-urlconnection",
|
|
240
240
|
"version": {
|
|
241
|
-
"requires": "4.9.
|
|
241
|
+
"requires": "4.9.2"
|
|
242
242
|
}
|
|
243
243
|
},
|
|
244
244
|
{
|
|
@@ -258,13 +258,13 @@
|
|
|
258
258
|
],
|
|
259
259
|
"files": [
|
|
260
260
|
{
|
|
261
|
-
"name": "react-native-0.67.
|
|
262
|
-
"url": "react-native-0.67.
|
|
263
|
-
"size":
|
|
264
|
-
"sha512": "
|
|
265
|
-
"sha256": "
|
|
266
|
-
"sha1": "
|
|
267
|
-
"md5": "
|
|
261
|
+
"name": "react-native-0.67.2.aar",
|
|
262
|
+
"url": "react-native-0.67.2.aar",
|
|
263
|
+
"size": 17805049,
|
|
264
|
+
"sha512": "9fa54c888fd61fce49b65610c0eb3cd6795e5e31683105b3048a5b31c34f59dd749c48e55d5577ba45fcd624bb4041028071cde82a91208d402f9352a70337af",
|
|
265
|
+
"sha256": "393697ad0a9bfe604f6f249cb23abc590b32ad3fb36cfc8c5d86327951b82fae",
|
|
266
|
+
"sha1": "6abbadc0b8174e42fb4f5d9f4a578deac714cc94",
|
|
267
|
+
"md5": "283c3ad2a09a9b26bcf8632c2d0cc7ab"
|
|
268
268
|
}
|
|
269
269
|
]
|
|
270
270
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
8306d9526b64d13db397518401120c8d
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
888a319cc189582061bd4bd83be7936b955ef96b
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
e65f086a817ed67457f9d20c1b2458cf50ee5023d9201a27dbd27522ca57f848
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
22a3aed0c26fbca4195b524f8f026d35496789b0bdb179e559e11cc26f19c0a585b887873748e88b477c303952a272907131bce579e63031c1de7c5d10c53a59
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
<modelVersion>4.0.0</modelVersion>
|
|
10
10
|
<groupId>com.facebook.react</groupId>
|
|
11
11
|
<artifactId>react-native</artifactId>
|
|
12
|
-
<version>0.67.
|
|
12
|
+
<version>0.67.2</version>
|
|
13
13
|
<packaging>aar</packaging>
|
|
14
14
|
<name>ReactNative</name>
|
|
15
15
|
<description>A framework for building native apps with React</description>
|
|
@@ -102,13 +102,13 @@
|
|
|
102
102
|
<dependency>
|
|
103
103
|
<groupId>com.squareup.okhttp3</groupId>
|
|
104
104
|
<artifactId>okhttp</artifactId>
|
|
105
|
-
<version>4.9.
|
|
105
|
+
<version>4.9.2</version>
|
|
106
106
|
<scope>compile</scope>
|
|
107
107
|
</dependency>
|
|
108
108
|
<dependency>
|
|
109
109
|
<groupId>com.squareup.okhttp3</groupId>
|
|
110
110
|
<artifactId>okhttp-urlconnection</artifactId>
|
|
111
|
-
<version>4.9.
|
|
111
|
+
<version>4.9.2</version>
|
|
112
112
|
<scope>compile</scope>
|
|
113
113
|
</dependency>
|
|
114
114
|
<dependency>
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
ed630b2ddccd5b319a6fbaff2739384d
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
f9eda3ab5913e1170f7af9d6f0fa3d0cfb100983
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
6822a0883d3963ee87d0cfc29cbf7b7ba118c839d3fd452de75c610cc77f1e8b
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
529f01e0c31fef37fc71c76795f2a4e93f4c022002c0357a9b25975b33b68fe0b967f5e64499148a5c56d8a3485e7fd82163abee2b2a48592c7cdb898e1a30ce
|
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
<groupId>com.facebook.react</groupId>
|
|
4
4
|
<artifactId>react-native</artifactId>
|
|
5
5
|
<versioning>
|
|
6
|
-
<latest>0.67.
|
|
7
|
-
<release>0.67.
|
|
6
|
+
<latest>0.67.2</latest>
|
|
7
|
+
<release>0.67.2</release>
|
|
8
8
|
<versions>
|
|
9
|
-
<version>0.67.
|
|
9
|
+
<version>0.67.2</version>
|
|
10
10
|
</versions>
|
|
11
|
-
<lastUpdated>
|
|
11
|
+
<lastUpdated>20220131172717</lastUpdated>
|
|
12
12
|
</versioning>
|
|
13
13
|
</metadata>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
9b0545c6bb0eb1658389321435d5885c
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
8299afcdcc6a5954b76e55326f1ac55b5c13d078
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
051604138bb47c3367f02ef0435982f8693194b3217d8681f984f5cbc948ce72
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
b16dc6917de8de9b40150e0d9528c07dad2f2a62ae34a6eecad27264f63fa2d26c4f71e146b920a653364a62bbd907e85ae4e11fe5b94b51786795cd14f44d4c
|
package/jest/mockModal.js
CHANGED
|
@@ -13,11 +13,11 @@
|
|
|
13
13
|
'use strict';
|
|
14
14
|
|
|
15
15
|
const React = require('react');
|
|
16
|
-
|
|
16
|
+
import typeof Modal from '../Libraries/Modal/Modal';
|
|
17
17
|
|
|
18
18
|
function mockModal(BaseComponent: $FlowFixMe) {
|
|
19
19
|
class ModalMock extends BaseComponent {
|
|
20
|
-
render(): React.Element<
|
|
20
|
+
render(): React.Element<Modal> {
|
|
21
21
|
return (
|
|
22
22
|
<BaseComponent {...this.props}>
|
|
23
23
|
{this.props.visible !== true ? null : this.props.children}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-native",
|
|
3
|
-
"version": "0.67.
|
|
3
|
+
"version": "0.67.2",
|
|
4
4
|
"bin": "./cli.js",
|
|
5
5
|
"description": "A framework for building native apps using React",
|
|
6
6
|
"license": "MIT",
|
|
@@ -156,7 +156,8 @@
|
|
|
156
156
|
"shelljs": "^0.7.8",
|
|
157
157
|
"signedsource": "^1.0.0",
|
|
158
158
|
"ws": "^6.1.4",
|
|
159
|
-
"yargs": "^15.3.1"
|
|
159
|
+
"yargs": "^15.3.1",
|
|
160
|
+
"inquirer": "^7.1.0"
|
|
160
161
|
},
|
|
161
162
|
"detox": {
|
|
162
163
|
"test-runner": "jest",
|
package/react.gradle
CHANGED
|
@@ -363,10 +363,6 @@ afterEvaluate {
|
|
|
363
363
|
} else {
|
|
364
364
|
// For JSC, delete all the libhermes* files
|
|
365
365
|
include "**/libhermes*.so"
|
|
366
|
-
// Delete the libjscexecutor from release build
|
|
367
|
-
if (cleanup) {
|
|
368
|
-
include "**/libjscexecutor.so"
|
|
369
|
-
}
|
|
370
366
|
}
|
|
371
367
|
}.visit { details ->
|
|
372
368
|
def targetVariant1 = ".*/transforms/[^/]*/${targetPath}/.*"
|
package/scripts/find-node.sh
CHANGED
|
@@ -19,12 +19,16 @@ fi
|
|
|
19
19
|
# Define NVM_DIR and source the nvm.sh setup script
|
|
20
20
|
[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
|
|
21
21
|
|
|
22
|
+
# Source nvm with '--no-use' and then `nvm use` to respect .nvmrc
|
|
23
|
+
# See: https://github.com/nvm-sh/nvm/issues/2053
|
|
22
24
|
if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
|
|
23
25
|
# shellcheck source=/dev/null
|
|
24
|
-
. "$HOME/.nvm/nvm.sh"
|
|
26
|
+
. "$HOME/.nvm/nvm.sh" --no-use
|
|
27
|
+
nvm use 2> /dev/null || nvm use default
|
|
25
28
|
elif [[ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]]; then
|
|
26
29
|
# shellcheck source=/dev/null
|
|
27
|
-
. "$(brew --prefix nvm)/nvm.sh"
|
|
30
|
+
. "$(brew --prefix nvm)/nvm.sh" --no-use
|
|
31
|
+
nvm use 2> /dev/null || nvm use default
|
|
28
32
|
fi
|
|
29
33
|
|
|
30
34
|
# Set up the nodenv node version manager if present
|
|
@@ -381,7 +381,8 @@ def __apply_Xcode_12_5_M1_post_install_workaround(installer)
|
|
|
381
381
|
installer.pods_project.targets.each do |target|
|
|
382
382
|
target.build_configurations.each do |config|
|
|
383
383
|
# ensure IPHONEOS_DEPLOYMENT_TARGET is at least 11.0
|
|
384
|
-
|
|
384
|
+
deployment_target = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f
|
|
385
|
+
should_upgrade = deployment_target < 11.0 && deployment_target != 0.0
|
|
385
386
|
if should_upgrade
|
|
386
387
|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
|
|
387
388
|
end
|
|
@@ -392,5 +393,6 @@ def __apply_Xcode_12_5_M1_post_install_workaround(installer)
|
|
|
392
393
|
# "Time.h:52:17: error: typedef redefinition with different types"
|
|
393
394
|
# We need to make a patch to RCT-Folly - remove the `__IPHONE_OS_VERSION_MIN_REQUIRED` check.
|
|
394
395
|
# See https://github.com/facebook/flipper/issues/834 for more details.
|
|
395
|
-
|
|
396
|
+
time_header = "#{Pod::Config.instance.installation_root.to_s}/Pods/RCT-Folly/folly/portability/Time.h"
|
|
397
|
+
`sed -i -e $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' #{time_header}`
|
|
396
398
|
end
|
package/template/Gemfile.lock
CHANGED
|
@@ -3,7 +3,7 @@ GEM
|
|
|
3
3
|
specs:
|
|
4
4
|
CFPropertyList (3.0.5)
|
|
5
5
|
rexml
|
|
6
|
-
activesupport (6.1.4.
|
|
6
|
+
activesupport (6.1.4.4)
|
|
7
7
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
|
8
8
|
i18n (>= 1.6, < 2)
|
|
9
9
|
minitest (>= 5.1)
|
|
@@ -15,7 +15,7 @@ GEM
|
|
|
15
15
|
httpclient (~> 2.8, >= 2.8.3)
|
|
16
16
|
json (>= 1.5.1)
|
|
17
17
|
atomos (0.1.3)
|
|
18
|
-
claide (1.0
|
|
18
|
+
claide (1.1.0)
|
|
19
19
|
cocoapods (1.11.2)
|
|
20
20
|
addressable (~> 2.8)
|
|
21
21
|
claide (>= 1.0.2, < 2.0)
|
|
@@ -58,15 +58,15 @@ GEM
|
|
|
58
58
|
escape (0.0.4)
|
|
59
59
|
ethon (0.15.0)
|
|
60
60
|
ffi (>= 1.15.0)
|
|
61
|
-
ffi (1.15.
|
|
61
|
+
ffi (1.15.5)
|
|
62
62
|
fourflusher (2.3.1)
|
|
63
63
|
fuzzy_match (2.0.4)
|
|
64
64
|
gh_inspector (1.1.3)
|
|
65
65
|
httpclient (2.8.3)
|
|
66
|
-
i18n (1.
|
|
66
|
+
i18n (1.9.1)
|
|
67
67
|
concurrent-ruby (~> 1.0)
|
|
68
68
|
json (2.6.1)
|
|
69
|
-
minitest (5.
|
|
69
|
+
minitest (5.15.0)
|
|
70
70
|
molinillo (0.8.0)
|
|
71
71
|
nanaimo (0.3.0)
|
|
72
72
|
nap (1.1.0)
|
|
@@ -85,7 +85,7 @@ GEM
|
|
|
85
85
|
colored2 (~> 3.1)
|
|
86
86
|
nanaimo (~> 0.3.0)
|
|
87
87
|
rexml (~> 3.2.4)
|
|
88
|
-
zeitwerk (2.5.
|
|
88
|
+
zeitwerk (2.5.4)
|
|
89
89
|
|
|
90
90
|
PLATFORMS
|
|
91
91
|
ruby
|
package/template/package.json
CHANGED
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.aar.md5
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
f3ecd04a029978ed9d9ca9ab386a6144
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.aar.sha1
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
dd5f57779cd9a3933b8f88c41ba3cf772b91537c
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.aar.sha256
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
7ee73ef3f7bc48fb599c25accba1c3186989469062a69b835c5c48daed400475
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.aar.sha512
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
217549fa8c8359c8340b63ac06533bdb8fb9e824dffdefd3f6517ebc61039e3857f3c8dfcecb6a4f234e1663de7e7128863a7ab877463b77ddbb171a460ec880
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.module.md5
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
ed3a69169b74c46266ba63237343512c
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.module.sha1
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
fdd638f0b0df8225ca56777f7f25d1fa3f299f17
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.module.sha256
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
8cfaf85a5559d7a518cf7a2b10020f401b617a27b1f59bbc27d22f26455e5ae6
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.module.sha512
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
9928681d799f0dd8080535002db08b427c34f3ce1d4a993edfabb394c8a55e75cb9412a6b11ecc52b8ffa727af3556d17211aa0c0587cde15161ad6cfb689655
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.pom.md5
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
3cc387637e26d5cad3269b2c44bae89d
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.pom.sha1
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
7b69485008b5f03d7abb90bd686ae7d77ce5c88e
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.pom.sha256
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
c4c40776e07c5baee80cb07384d6a3f4947d4598dcef50e74da5f9c7aca70926
|
package/android/com/facebook/react/react-native/0.67.0-rc.5/react-native-0.67.0-rc.5.pom.sha512
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
2c3423d8953ed6851fe63253a84129fa93b6d8b55439430e2d5364371c28d8a8bc3583b5cb7d06198bc2a05d2a4136de95f53759f6e6a7f16cef8ee949bca1a3
|