mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Compare commits
37
Commits
fix/cli-start
...
v0.66.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6c19dc3266 | ||
|
|
11644d78ed | ||
|
|
9d601e4177 | ||
|
|
7382f556d3 | ||
|
|
d48ed4a4bb | ||
|
|
80e5abdab3 | ||
|
|
e94f9fa76a | ||
|
|
bd01f16be8 | ||
|
|
09a21f0f37 | ||
|
|
d47fd4a32e | ||
|
|
a6a983d80d | ||
|
|
ef280d6edf | ||
|
|
99673187ef | ||
|
|
6b014e8d8e | ||
|
|
ab50c6ee2e | ||
|
|
dc453da92c | ||
|
|
8b6d7fddd6 | ||
|
|
614a370d86 | ||
|
|
c97015d2fa | ||
|
|
c282c2d3b7 | ||
|
|
2133172ea2 | ||
|
|
013e623fbb | ||
|
|
b4a1d2ba64 | ||
|
|
0d7586c620 | ||
|
|
d552362f85 | ||
|
|
1594af13bc | ||
|
|
038cdda238 | ||
|
|
ea5109fc0e | ||
|
|
b23dd8565a | ||
|
|
d20b34a562 | ||
|
|
a0429ebb54 | ||
|
|
ab829005bd | ||
|
|
27073242f2 | ||
|
|
b78f6cee7d | ||
|
|
10daf76e68 | ||
|
|
e6eb81e097 | ||
|
|
72eb06009b |
+1
-1
@@ -100,9 +100,9 @@ package-lock.json
|
||||
!/packages/rn-tester/Pods/__offline_mirrors__
|
||||
|
||||
# react-native-codegen
|
||||
/React/FBReactNativeSpec/FBReactNativeSpec
|
||||
/packages/react-native-codegen/lib
|
||||
/ReactCommon/react/renderer/components/rncore/
|
||||
/packages/rn-tester/NativeModuleExample/ScreenshotManagerSpec*
|
||||
|
||||
# Visual studio
|
||||
.vscode
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React-RCTBlob"
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
/**
|
||||
* @generated by scripts/bump-oss-version.js
|
||||
*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*
|
||||
* @format
|
||||
* @generated by scripts/bump-oss-version.js
|
||||
* @flow strict
|
||||
*/
|
||||
|
||||
exports.version = {
|
||||
major: 0,
|
||||
minor: 0,
|
||||
patch: 0,
|
||||
minor: 66,
|
||||
patch: 2,
|
||||
prerelease: null,
|
||||
};
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React-RCTImage"
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React-RCTLinking"
|
||||
|
||||
@@ -320,40 +320,40 @@ export function checkWarningFilter(format: string): WarningInfo {
|
||||
return warningFilter(format);
|
||||
}
|
||||
|
||||
export function getIgnorePatterns(): $ReadOnlyArray<IgnorePattern> {
|
||||
return Array.from(ignorePatterns);
|
||||
}
|
||||
|
||||
export function addIgnorePatterns(
|
||||
patterns: $ReadOnlyArray<IgnorePattern>,
|
||||
): void {
|
||||
const existingSize = ignorePatterns.size;
|
||||
// The same pattern may be added multiple times, but adding a new pattern
|
||||
// can be expensive so let's find only the ones that are new.
|
||||
const newPatterns = patterns.filter((pattern: IgnorePattern) => {
|
||||
patterns.forEach((pattern: IgnorePattern) => {
|
||||
if (pattern instanceof RegExp) {
|
||||
for (const existingPattern of ignorePatterns.entries()) {
|
||||
for (const existingPattern of ignorePatterns) {
|
||||
if (
|
||||
existingPattern instanceof RegExp &&
|
||||
existingPattern.toString() === pattern.toString()
|
||||
) {
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
ignorePatterns.add(pattern);
|
||||
}
|
||||
return !ignorePatterns.has(pattern);
|
||||
ignorePatterns.add(pattern);
|
||||
});
|
||||
|
||||
if (newPatterns.length === 0) {
|
||||
if (ignorePatterns.size === existingSize) {
|
||||
return;
|
||||
}
|
||||
for (const pattern of newPatterns) {
|
||||
ignorePatterns.add(pattern);
|
||||
|
||||
// We need to recheck all of the existing logs.
|
||||
// This allows adding an ignore pattern anywhere in the codebase.
|
||||
// Without this, if you ignore a pattern after the a log is created,
|
||||
// then we would keep showing the log.
|
||||
logs = new Set(
|
||||
Array.from(logs).filter(log => !isMessageIgnored(log.message.content)),
|
||||
);
|
||||
}
|
||||
// We need to recheck all of the existing logs.
|
||||
// This allows adding an ignore pattern anywhere in the codebase.
|
||||
// Without this, if you ignore a pattern after the a log is created,
|
||||
// then we would keep showing the log.
|
||||
logs = new Set(
|
||||
Array.from(logs).filter(log => !isMessageIgnored(log.message.content)),
|
||||
);
|
||||
handleUpdate();
|
||||
}
|
||||
|
||||
|
||||
@@ -418,6 +418,26 @@ describe('LogBoxData', () => {
|
||||
expect(logs[0].count).toBe(2);
|
||||
});
|
||||
|
||||
it('adding same pattern multiple times', () => {
|
||||
expect(LogBoxData.getIgnorePatterns().length).toBe(0);
|
||||
LogBoxData.addIgnorePatterns(['abc']);
|
||||
expect(LogBoxData.getIgnorePatterns().length).toBe(1);
|
||||
LogBoxData.addIgnorePatterns([/abc/]);
|
||||
expect(LogBoxData.getIgnorePatterns().length).toBe(2);
|
||||
LogBoxData.addIgnorePatterns(['abc']);
|
||||
expect(LogBoxData.getIgnorePatterns().length).toBe(2);
|
||||
LogBoxData.addIgnorePatterns([/abc/]);
|
||||
expect(LogBoxData.getIgnorePatterns().length).toBe(2);
|
||||
});
|
||||
|
||||
it('adding duplicated patterns', () => {
|
||||
expect(LogBoxData.getIgnorePatterns().length).toBe(0);
|
||||
LogBoxData.addIgnorePatterns(['abc', /ab/, /abc/, /abc/, 'abc']);
|
||||
expect(LogBoxData.getIgnorePatterns().length).toBe(3);
|
||||
LogBoxData.addIgnorePatterns([/ab/, /abc/]);
|
||||
expect(LogBoxData.getIgnorePatterns().length).toBe(3);
|
||||
});
|
||||
|
||||
it('ignores logs matching patterns (logs)', () => {
|
||||
addLogs(['A!', 'B?', 'C!']);
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React-RCTAnimation"
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React-RCTNetwork"
|
||||
|
||||
@@ -43,7 +43,8 @@ export type PermissionType =
|
||||
| 'android.permission.READ_EXTERNAL_STORAGE'
|
||||
| 'android.permission.WRITE_EXTERNAL_STORAGE'
|
||||
| 'android.permission.BLUETOOTH_CONNECT'
|
||||
| 'android.permission.BLUETOOTH_SCAN';
|
||||
| 'android.permission.BLUETOOTH_SCAN'
|
||||
| 'android.permission.BLUETOOTH_ADVERTISE';
|
||||
*/
|
||||
|
||||
export interface Spec extends TurboModule {
|
||||
|
||||
@@ -61,6 +61,7 @@ const PERMISSIONS = Object.freeze({
|
||||
WRITE_EXTERNAL_STORAGE: 'android.permission.WRITE_EXTERNAL_STORAGE',
|
||||
BLUETOOTH_CONNECT: 'android.permission.BLUETOOTH_CONNECT',
|
||||
BLUETOOTH_SCAN: 'android.permission.BLUETOOTH_SCAN',
|
||||
BLUETOOTH_ADVERTISE: 'android.permission.BLUETOOTH_ADVERTISE',
|
||||
});
|
||||
|
||||
/**
|
||||
@@ -75,6 +76,7 @@ class PermissionsAndroid {
|
||||
ACCESS_COARSE_LOCATION: string,
|
||||
ACCESS_FINE_LOCATION: string,
|
||||
ADD_VOICEMAIL: string,
|
||||
BLUETOOTH_ADVERTISE: string,
|
||||
BLUETOOTH_CONNECT: string,
|
||||
BLUETOOTH_SCAN: string,
|
||||
BODY_SENSORS: string,
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React-RCTPushNotification"
|
||||
|
||||
@@ -34,6 +34,7 @@ function getConstants(): Object {
|
||||
function getViewManagerConfig(viewManagerName: string): any {
|
||||
if (
|
||||
viewManagerConfigs[viewManagerName] === undefined &&
|
||||
global.nativeCallSyncHook && // If we're in the Chrome Debugger, let's not even try calling the sync method
|
||||
NativeUIManager.getConstantsForViewManager
|
||||
) {
|
||||
try {
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React-RCTSettings"
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "RCTTypeSafety"
|
||||
|
||||
@@ -20,8 +20,8 @@ function deprecatedPropType(
|
||||
return function validate(props, propName, componentName, ...rest) {
|
||||
// Don't warn for native components.
|
||||
if (
|
||||
!global.RN$Bridgeless &&
|
||||
UIManager.hasViewManagerConfig(componentName) &&
|
||||
global.RN$Bridgeless !== true &&
|
||||
!UIManager.hasViewManagerConfig(componentName) &&
|
||||
props[propName] !== undefined
|
||||
) {
|
||||
console.warn(
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React-RCTVibration"
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
header_subspecs = {
|
||||
|
||||
@@ -21,11 +21,11 @@ NSDictionary* RCTGetReactNativeVersion(void)
|
||||
static dispatch_once_t onceToken;
|
||||
dispatch_once(&onceToken, ^(void){
|
||||
__rnVersion = @{
|
||||
RCTVersionMajor: @(0),
|
||||
RCTVersionMinor: @(0),
|
||||
RCTVersionPatch: @(0),
|
||||
RCTVersionPrerelease: [NSNull null],
|
||||
};
|
||||
RCTVersionMajor: @(0),
|
||||
RCTVersionMinor: @(66),
|
||||
RCTVersionPatch: @(2),
|
||||
RCTVersionPrerelease: [NSNull null],
|
||||
};
|
||||
});
|
||||
return __rnVersion;
|
||||
}
|
||||
|
||||
@@ -89,7 +89,9 @@ RCT_EXPORT_MODULE(Appearance)
|
||||
|
||||
RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSString *, getColorScheme)
|
||||
{
|
||||
_currentColorScheme = RCTColorSchemePreference(nil);
|
||||
if (_currentColorScheme == nil) {
|
||||
_currentColorScheme = RCTColorSchemePreference(nil);
|
||||
}
|
||||
return _currentColorScheme;
|
||||
}
|
||||
|
||||
|
||||
@@ -72,6 +72,7 @@ RCT_EXPORT_METHOD(hide)
|
||||
if (!strongSelf) {
|
||||
return;
|
||||
}
|
||||
[strongSelf->_view setHidden: YES];
|
||||
strongSelf->_view = nil;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React-CoreModules"
|
||||
|
||||
@@ -18,7 +18,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "FBReactNativeSpec"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -18,7 +18,7 @@ end
|
||||
|
||||
folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1'
|
||||
folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
@@ -156,6 +156,14 @@ LOCAL_EXPORT_C_INCLUDES := \
|
||||
$(REACT_COMMON_DIR)/react/renderer/components/view
|
||||
include $(PREBUILT_SHARED_LIBRARY)
|
||||
|
||||
# jsi
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := jsi
|
||||
LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libjsi.so
|
||||
LOCAL_EXPORT_C_INCLUDES := \
|
||||
$(REACT_COMMON_DIR)/jsi
|
||||
include $(PREBUILT_SHARED_LIBRARY)
|
||||
|
||||
# react_codegen_rncore
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := react_codegen_rncore
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
VERSION_NAME=1000.0.0-main
|
||||
VERSION_NAME=0.66.2
|
||||
GROUP=com.facebook.react
|
||||
|
||||
POM_NAME=ReactNative
|
||||
|
||||
@@ -18,8 +18,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
|
||||
|
||||
LOCAL_CPP_FEATURES := exceptions
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsireact libjsi
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
|
||||
LOCAL_STATIC_LIBRARIES := libjsireact
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
|
||||
|
||||
LOCAL_CPP_FEATURES := exceptions
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-executor-common-release
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
|
||||
LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-release
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
@@ -34,7 +34,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
|
||||
|
||||
LOCAL_CPP_FEATURES := exceptions
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-executor-common-debug libhermes-inspector
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
|
||||
LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-debug libhermes-inspector
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes libjsi
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ public class HermesExecutorFactory implements JavaScriptExecutorFactory {
|
||||
private final RuntimeConfig mConfig;
|
||||
|
||||
public HermesExecutorFactory() {
|
||||
this(new RuntimeConfig(1024));
|
||||
this(null);
|
||||
}
|
||||
|
||||
public HermesExecutorFactory(RuntimeConfig config) {
|
||||
|
||||
@@ -10,10 +10,4 @@ package com.facebook.hermes.reactexecutor;
|
||||
/** Holds runtime configuration for a Hermes VM instance (master or snapshot). */
|
||||
public final class RuntimeConfig {
|
||||
public long heapSizeMB;
|
||||
|
||||
RuntimeConfig() {}
|
||||
|
||||
RuntimeConfig(long heapSizeMB) {
|
||||
this.heapSizeMB = heapSizeMB;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
package com.facebook.react;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.res.Configuration;
|
||||
import android.os.Bundle;
|
||||
import android.view.KeyEvent;
|
||||
import androidx.annotation.Nullable;
|
||||
@@ -121,6 +122,12 @@ public abstract class ReactActivity extends AppCompatActivity
|
||||
mDelegate.onWindowFocusChanged(hasFocus);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConfigurationChanged(Configuration newConfig) {
|
||||
super.onConfigurationChanged(newConfig);
|
||||
mDelegate.onConfigurationChanged(newConfig);
|
||||
}
|
||||
|
||||
protected final ReactNativeHost getReactNativeHost() {
|
||||
return mDelegate.getReactNativeHost();
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ import android.annotation.TargetApi;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.res.Configuration;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.view.KeyEvent;
|
||||
@@ -154,6 +155,12 @@ public class ReactActivityDelegate {
|
||||
}
|
||||
}
|
||||
|
||||
public void onConfigurationChanged(Configuration newConfig) {
|
||||
if (getReactNativeHost().hasInstance()) {
|
||||
getReactInstanceManager().onConfigurationChanged(getContext(), newConfig);
|
||||
}
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.M)
|
||||
public void requestPermissions(
|
||||
String[] permissions, int requestCode, PermissionListener listener) {
|
||||
|
||||
@@ -11,7 +11,7 @@ LOCAL_MODULE := fabricjni
|
||||
|
||||
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry
|
||||
|
||||
LOCAL_STATIC_LIBRARIES :=
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
|
||||
|
||||
LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi libjsireact jscruntime
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni
|
||||
LOCAL_STATIC_LIBRARIES := libjsireact jscruntime
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libjsi
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
+10
-1
@@ -7,6 +7,7 @@
|
||||
|
||||
package com.facebook.react.modules.appearance;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.res.Configuration;
|
||||
import androidx.annotation.Nullable;
|
||||
@@ -74,7 +75,15 @@ public class AppearanceModule extends NativeAppearanceSpec {
|
||||
|
||||
@Override
|
||||
public String getColorScheme() {
|
||||
mColorScheme = colorSchemeForCurrentConfiguration(getReactApplicationContext());
|
||||
// Attempt to use the Activity context first in order to get the most up to date
|
||||
// scheme. This covers the scenario when AppCompatDelegate.setDefaultNightMode()
|
||||
// is called directly (which can occur in Brownfield apps for example).
|
||||
Activity activity = getCurrentActivity();
|
||||
|
||||
mColorScheme =
|
||||
colorSchemeForCurrentConfiguration(
|
||||
activity != null ? activity : getReactApplicationContext());
|
||||
|
||||
return mColorScheme;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
|
||||
|
||||
LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi libjsireact
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni
|
||||
LOCAL_STATIC_LIBRARIES := libjsireact
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libjsi
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
+2
-2
@@ -16,7 +16,7 @@ import java.util.Map;
|
||||
public class ReactNativeVersion {
|
||||
public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
|
||||
"major", 0,
|
||||
"minor", 0,
|
||||
"patch", 0,
|
||||
"minor", 66,
|
||||
"patch", 2,
|
||||
"prerelease", null);
|
||||
}
|
||||
|
||||
+8
-8
@@ -1106,8 +1106,8 @@ public class ReactViewBackgroundDrawable extends Drawable {
|
||||
int width = Math.round(borderWidth.left);
|
||||
updatePathEffect(width);
|
||||
mPaint.setStrokeWidth(width);
|
||||
mPathForSingleBorder.moveTo(left, top - borderWidth.top / 2);
|
||||
mPathForSingleBorder.lineTo(left, bottom + borderWidth.bottom / 2);
|
||||
mPathForSingleBorder.moveTo(left + width / 2, top);
|
||||
mPathForSingleBorder.lineTo(left + width / 2, bottom);
|
||||
canvas.drawPath(mPathForSingleBorder, mPaint);
|
||||
}
|
||||
if (borderTop > 0) {
|
||||
@@ -1115,8 +1115,8 @@ public class ReactViewBackgroundDrawable extends Drawable {
|
||||
int width = Math.round(borderWidth.top);
|
||||
updatePathEffect(width);
|
||||
mPaint.setStrokeWidth(width);
|
||||
mPathForSingleBorder.moveTo(left, top);
|
||||
mPathForSingleBorder.lineTo(right, top);
|
||||
mPathForSingleBorder.moveTo(left, top + width / 2);
|
||||
mPathForSingleBorder.lineTo(right, top + width / 2);
|
||||
canvas.drawPath(mPathForSingleBorder, mPaint);
|
||||
}
|
||||
if (borderRight > 0) {
|
||||
@@ -1124,8 +1124,8 @@ public class ReactViewBackgroundDrawable extends Drawable {
|
||||
int width = Math.round(borderWidth.right);
|
||||
updatePathEffect(width);
|
||||
mPaint.setStrokeWidth(width);
|
||||
mPathForSingleBorder.moveTo(right, top - borderWidth.top / 2);
|
||||
mPathForSingleBorder.lineTo(right, bottom + borderWidth.bottom / 2);
|
||||
mPathForSingleBorder.moveTo(right - width / 2, top);
|
||||
mPathForSingleBorder.lineTo(right - width / 2, bottom);
|
||||
canvas.drawPath(mPathForSingleBorder, mPaint);
|
||||
}
|
||||
if (borderBottom > 0) {
|
||||
@@ -1133,8 +1133,8 @@ public class ReactViewBackgroundDrawable extends Drawable {
|
||||
int width = Math.round(borderWidth.bottom);
|
||||
updatePathEffect(width);
|
||||
mPaint.setStrokeWidth(width);
|
||||
mPathForSingleBorder.moveTo(left, bottom);
|
||||
mPathForSingleBorder.lineTo(right, bottom);
|
||||
mPathForSingleBorder.moveTo(left, bottom - width / 2);
|
||||
mPathForSingleBorder.lineTo(right, bottom - width / 2);
|
||||
canvas.drawPath(mPathForSingleBorder, mPaint);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
folly_dep_name = 'RCT-Folly/Fabric'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
@@ -18,7 +18,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
@@ -16,8 +16,8 @@ namespace facebook::react {
|
||||
|
||||
constexpr struct {
|
||||
int32_t Major = 0;
|
||||
int32_t Minor = 0;
|
||||
int32_t Patch = 0;
|
||||
int32_t Minor = 66;
|
||||
int32_t Patch = 2;
|
||||
std::string_view Prerelease = "";
|
||||
} ReactNativeVersion;
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
@@ -16,8 +16,8 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi libjsireact
|
||||
LOCAL_SHARED_LIBRARIES := libhermes
|
||||
LOCAL_STATIC_LIBRARIES := libjsireact
|
||||
LOCAL_SHARED_LIBRARIES := libhermes libjsi
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
@@ -31,7 +31,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi libjsireact libhermes-inspector
|
||||
LOCAL_SHARED_LIBRARIES := libhermes
|
||||
LOCAL_STATIC_LIBRARIES := libjsireact libhermes-inspector
|
||||
LOCAL_SHARED_LIBRARIES := libhermes libjsi
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
@@ -21,7 +21,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_ROOT)
|
||||
|
||||
LOCAL_CPP_FEATURES := exceptions
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi
|
||||
LOCAL_SHARED_LIBRARIES := jsinspector libfb libfbjni libfolly_futures libfolly_json libhermes
|
||||
LOCAL_SHARED_LIBRARIES := jsinspector libfb libfbjni libfolly_futures libfolly_json libhermes libjsi libglog
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
@@ -17,7 +17,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
|
||||
LOCAL_CFLAGS := -fexceptions -frtti -O3
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json glog
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
@@ -16,7 +16,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
|
||||
|
||||
LOCAL_CFLAGS := -fexceptions -frtti -O3
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi reactnative reactperflogger
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json glog
|
||||
LOCAL_STATIC_LIBRARIES := reactnative reactperflogger
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json glog libjsi
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
@@ -18,7 +18,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
@@ -15,9 +15,9 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp) $(wildcard $(LOCA
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/platform/android/
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libfbjni libfolly_json libreactnativejni libreact_debug
|
||||
LOCAL_SHARED_LIBRARIES := libfbjni libfolly_json libreactnativejni libreact_debug libjsi
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi libreactperflogger
|
||||
LOCAL_STATIC_LIBRARIES := libreactperflogger
|
||||
|
||||
LOCAL_CFLAGS := \
|
||||
-DLOG_TAG=\"ReactNative\"
|
||||
|
||||
@@ -10,7 +10,7 @@ LOCAL_MODULE := sampleturbomodule
|
||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)
|
||||
LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp)
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
|
||||
LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core
|
||||
LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core libjsi
|
||||
LOCAL_CFLAGS := \
|
||||
-DLOG_TAG=\"ReactNative\"
|
||||
LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
|
||||
|
||||
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
|
||||
|
||||
LOCAL_STATIC_LIBRARIES :=
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_render_imagemanager libreact_debug libreact_render_mapbuffer
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_render_imagemanager libreact_debug libreact_render_mapbuffer
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
|
||||
|
||||
LOCAL_STATIC_LIBRARIES :=
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
|
||||
|
||||
LOCAL_STATIC_LIBRARIES :=
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_mounting librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_textlayoutmanager libreact_render_attributedstring libreact_render_mounting librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
|
||||
|
||||
LOCAL_STATIC_LIBRARIES :=
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring librrc_text librrc_image librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_mounting libreact_render_componentregistry libreact_render_debug libreact_render_graphics libreact_render_uimanager libreact_render_imagemanager libreact_render_textlayoutmanager libreact_render_attributedstring librrc_text librrc_image librrc_view libreact_utils libreact_debug libreact_render_mapbuffer
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
|
||||
|
||||
LOCAL_STATIC_LIBRARIES :=
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
|
||||
|
||||
LOCAL_STATIC_LIBRARIES :=
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug logger
|
||||
LOCAL_SHARED_LIBRARIES := libyoga glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug logger libjsi
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libjsi libfolly_futures libreact_utils libreact_debug libreact_render_debug libreact_render_graphics
|
||||
LOCAL_SHARED_LIBRARIES := libfolly_json libjsi libfolly_futures libreact_utils libreact_debug libreact_render_debug libreact_render_graphics libglog
|
||||
|
||||
LOCAL_CFLAGS := \
|
||||
-DLOG_TAG=\"Fabric\"
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
|
||||
|
||||
LOCAL_STATIC_LIBRARIES :=
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug libreact_render_telemetry
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libbetter libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug librrc_view librrc_root libreact_utils libreact_debug libreact_render_telemetry
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core libreact_debug
|
||||
LOCAL_SHARED_LIBRARIES := libruntimeexecutor libreact_render_core libreact_debug libjsi
|
||||
|
||||
LOCAL_CFLAGS := \
|
||||
-DLOG_TAG=\"Fabric\"
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
boost_compiler_flags = '-Wno-documentation'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
+45
-10
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "react-native",
|
||||
"private": true,
|
||||
"version": "1000.0.0",
|
||||
"version": "0.66.2",
|
||||
"bin": "./cli.js",
|
||||
"description": "A framework for building native apps using React",
|
||||
"license": "MIT",
|
||||
@@ -81,10 +80,6 @@
|
||||
"test-ios-e2e": "detox test -c ios.sim.release packages/rn-tester/e2e",
|
||||
"test-ios": "./scripts/objc-test.sh test"
|
||||
},
|
||||
"workspaces": [
|
||||
"packages/!(eslint-config-react-native-community)",
|
||||
"repo-config"
|
||||
],
|
||||
"peerDependencies": {
|
||||
"react": "17.0.2"
|
||||
},
|
||||
@@ -95,12 +90,12 @@
|
||||
"@react-native-community/cli-platform-ios": "^6.0.0",
|
||||
"@react-native/assets": "1.0.0",
|
||||
"@react-native/normalize-color": "1.0.0",
|
||||
"@react-native/polyfills": "1.0.0",
|
||||
"@react-native/polyfills": "2.0.0",
|
||||
"abort-controller": "^3.0.0",
|
||||
"anser": "^1.4.9",
|
||||
"base64-js": "^1.1.2",
|
||||
"event-target-shim": "^5.0.1",
|
||||
"hermes-engine": "~0.8.0",
|
||||
"hermes-engine": "~0.9.0",
|
||||
"invariant": "^2.2.4",
|
||||
"jsc-android": "^250230.2.1",
|
||||
"metro-babel-register": "0.66.2",
|
||||
@@ -112,6 +107,7 @@
|
||||
"promise": "^8.0.3",
|
||||
"prop-types": "^15.7.2",
|
||||
"react-devtools-core": "^4.13.0",
|
||||
"react-native-codegen": "^0.0.7",
|
||||
"react-refresh": "^0.4.0",
|
||||
"regenerator-runtime": "^0.13.2",
|
||||
"scheduler": "^0.20.2",
|
||||
@@ -122,7 +118,46 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"flow-bin": "^0.158.0",
|
||||
"react": "17.0.2"
|
||||
"react": "17.0.2",
|
||||
"@babel/core": "^7.14.0",
|
||||
"@babel/generator": "^7.14.0",
|
||||
"@babel/template": "^7.0.0",
|
||||
"@babel/types": "^7.0.0",
|
||||
"@react-native-community/eslint-plugin": "*",
|
||||
"@reactions/component": "^2.0.2",
|
||||
"async": "^2.4.0",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"babel-preset-fbjs": "^3.4.0",
|
||||
"clang-format": "^1.2.4",
|
||||
"connect": "^3.6.5",
|
||||
"coveralls": "^3.0.2",
|
||||
"detox": "16.7.2",
|
||||
"eslint": "7.12.0",
|
||||
"eslint-config-fb-strict": "^24.9.0",
|
||||
"eslint-config-fbjs": "2.1.0",
|
||||
"eslint-config-prettier": "^6.0.0",
|
||||
"eslint-plugin-babel": "^5.3.0",
|
||||
"eslint-plugin-eslint-comments": "^3.1.1",
|
||||
"eslint-plugin-flowtype": "2.50.3",
|
||||
"eslint-plugin-jest": "22.4.1",
|
||||
"eslint-plugin-jsx-a11y": "6.2.1",
|
||||
"eslint-plugin-prettier": "2.6.2",
|
||||
"eslint-plugin-react": "7.21.5",
|
||||
"eslint-plugin-react-hooks": "^4.2.0",
|
||||
"eslint-plugin-react-native": "3.10.0",
|
||||
"eslint-plugin-relay": "1.8.1",
|
||||
"jest": "^26.6.3",
|
||||
"jest-junit": "^10.0.0",
|
||||
"jscodeshift": "^0.11.0",
|
||||
"metro-transform-plugins": "^0.66.0",
|
||||
"mkdirp": "^0.5.1",
|
||||
"prettier": "1.19.1",
|
||||
"react-shallow-renderer": "16.14.1",
|
||||
"react-test-renderer": "17.0.2",
|
||||
"shelljs": "^0.7.8",
|
||||
"signedsource": "^1.0.0",
|
||||
"ws": "^6.1.4",
|
||||
"yargs": "^15.3.1"
|
||||
},
|
||||
"detox": {
|
||||
"test-runner": "jest",
|
||||
@@ -161,4 +196,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@react-native/polyfills",
|
||||
"version": "1.0.0",
|
||||
"version": "2.0.0",
|
||||
"description": "Polyfills for React Native.",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
||||
@@ -80,9 +80,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/${libraryName}
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_CFLAGS := \\
|
||||
-DLOG_TAG=\\"ReactNative\\"
|
||||
|
||||
+6
-18
@@ -52,9 +52,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/complex_objects
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_CFLAGS := \\\\
|
||||
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
|
||||
@@ -118,9 +116,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/empty_native_modules
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_CFLAGS := \\\\
|
||||
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
|
||||
@@ -184,9 +180,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_CFLAGS := \\\\
|
||||
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
|
||||
@@ -258,9 +252,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/real_module_example
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_CFLAGS := \\\\
|
||||
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
|
||||
@@ -324,9 +316,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/simple_native_modules
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_CFLAGS := \\\\
|
||||
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
|
||||
@@ -398,9 +388,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/two_modules_different_files
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libjsi
|
||||
LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libreact_debug libreact_render_debug
|
||||
|
||||
LOCAL_CFLAGS := \\\\
|
||||
-DLOG_TAG=\\\\\\"ReactNative\\\\\\"
|
||||
|
||||
@@ -58,4 +58,5 @@ end
|
||||
|
||||
post_install do |installer|
|
||||
react_native_post_install(installer)
|
||||
__apply_Xcode_12_5_M1_post_install_workaround(installer)
|
||||
end
|
||||
|
||||
+269
-618
File diff suppressed because it is too large
Load Diff
@@ -17,7 +17,7 @@ else
|
||||
end
|
||||
|
||||
folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
|
||||
folly_version = '2021.06.28.00'
|
||||
folly_version = '2021.06.28.00-v2'
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React-RCTTest"
|
||||
|
||||
@@ -321,7 +321,6 @@
|
||||
C38CB0C2095A8FFDE13321E5 /* Pods-RNTesterUnitTests.debug.xcconfig */,
|
||||
8735BC063632C9712E25C7D9 /* Pods-RNTesterUnitTests.release.xcconfig */,
|
||||
);
|
||||
name = Pods;
|
||||
path = Pods;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
@@ -610,7 +609,7 @@
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "set -e\n\nexport NODE_BINARY=node\nexport PROJECT_ROOT=\"$SRCROOT/../../\"\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true\n\"$SRCROOT/../../scripts/react-native-xcode.sh\" $SRCROOT/../../packages/rn-tester/js/RNTesterApp.ios.js\n";
|
||||
shellScript = "set -e\n\nexport NODE_BINARY=node\nexport PROJECT_ROOT=\"$SRCROOT/../../\"\nexport ENTRY_FILE=\"$SRCROOT/js/RNTesterApp.ios.js\"\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true\n\"$SRCROOT/../../scripts/react-native-xcode.sh\"\n";
|
||||
};
|
||||
A2FBDDDD0C26B4EFA3726B6C /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
@@ -784,6 +783,7 @@
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"\"$(SDKROOT)/usr/lib/swift\"",
|
||||
"$(inherited)",
|
||||
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
|
||||
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
|
||||
@@ -818,6 +818,7 @@
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"\"$(SDKROOT)/usr/lib/swift\"",
|
||||
"$(inherited)",
|
||||
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
|
||||
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
|
||||
|
||||
-12
@@ -7,12 +7,10 @@
|
||||
|
||||
package com.facebook.react.uiapp;
|
||||
|
||||
import android.content.res.Configuration;
|
||||
import android.os.Bundle;
|
||||
import androidx.annotation.Nullable;
|
||||
import com.facebook.react.ReactActivity;
|
||||
import com.facebook.react.ReactActivityDelegate;
|
||||
import com.facebook.react.ReactInstanceManager;
|
||||
import com.facebook.react.ReactRootView;
|
||||
|
||||
public class RNTesterActivity extends ReactActivity {
|
||||
@@ -64,14 +62,4 @@ public class RNTesterActivity extends ReactActivity {
|
||||
protected String getMainComponentName() {
|
||||
return "RNTesterApp";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConfigurationChanged(Configuration newConfig) {
|
||||
super.onConfigurationChanged(newConfig);
|
||||
ReactInstanceManager instanceManager = getReactInstanceManager();
|
||||
|
||||
if (instanceManager != null) {
|
||||
instanceManager.onConfigurationChanged(this, newConfig);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -130,6 +130,10 @@ let packageJson = JSON.parse(cat('package.json'));
|
||||
packageJson.version = version;
|
||||
delete packageJson.workspaces;
|
||||
delete packageJson.private;
|
||||
|
||||
// Copy dependencies over from repo-config/package.json
|
||||
const repoConfigJson = JSON.parse(cat('repo-config/package.json'));
|
||||
packageJson.devDependencies = {...packageJson.devDependencies, ...repoConfigJson.dependencies};
|
||||
fs.writeFileSync('package.json', JSON.stringify(packageJson, null, 2), 'utf-8');
|
||||
|
||||
// Change ReactAndroid/gradle.properties
|
||||
@@ -149,23 +153,37 @@ if (
|
||||
exec(`node scripts/set-rn-template-version.js ${version}`);
|
||||
|
||||
// Verify that files changed, we just do a git diff and check how many times version is added across files
|
||||
const filesToValidate = [
|
||||
'package.json',
|
||||
'ReactAndroid/gradle.properties',
|
||||
'template/package.json',
|
||||
];
|
||||
let numberOfChangedLinesWithNewVersion = exec(
|
||||
`git diff -U0 | grep '^[+]' | grep -c ${version} `,
|
||||
`git diff -U0 ${filesToValidate.join(' ')}| grep '^[+]' | grep -c ${version} `,
|
||||
{silent: true},
|
||||
).stdout.trim();
|
||||
|
||||
// Release builds should commit the version bumps, and create tags.
|
||||
// Nightly builds do not need to do that.
|
||||
if (!nightlyBuild) {
|
||||
if (+numberOfChangedLinesWithNewVersion !== 3) {
|
||||
if (+numberOfChangedLinesWithNewVersion !== filesToValidate.length) {
|
||||
echo(
|
||||
'Failed to update all the files. package.json and gradle.properties must have versions in them',
|
||||
`Failed to update all the files: [${filesToValidate.join(', ')}] must have versions in them`,
|
||||
);
|
||||
echo('Fix the issue, revert and try again');
|
||||
exec('git diff');
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// Update Podfile.lock only on release builds, not nightly.
|
||||
// Nightly builds don't need it as the main branch will already be up-to-date.
|
||||
echo('Updating RNTester Podfile.lock...');
|
||||
if (exec('source scripts/update_podfile_lock.sh && update_pods').code) {
|
||||
echo('Failed to update RNTester Podfile.lock.');
|
||||
echo('Fix the issue, revert and try again.');
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// Make commit [0.21.0-rc] Bump version numbers
|
||||
if (exec(`git commit -a -m "[${version}] Bump version numbers"`).code) {
|
||||
echo('failed to commit');
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
|
||||
let RNCodegen;
|
||||
try {
|
||||
RNCodegen = require('react-native-codegen/lib/generators/RNCodegen.js');
|
||||
} catch (e) {
|
||||
RNCodegen = require('../packages/react-native-codegen/lib/generators/RNCodegen.js');
|
||||
} catch (e) {
|
||||
RNCodegen = require('react-native-codegen/lib/generators/RNCodegen.js');
|
||||
if (!RNCodegen) {
|
||||
throw 'RNCodegen not found.';
|
||||
}
|
||||
|
||||
@@ -74,14 +74,14 @@ else
|
||||
ENTRY_FILE=${1:-index.js}
|
||||
fi
|
||||
|
||||
if [[ $DEV != true && ! -f "../$ENTRY_FILE" ]]; then
|
||||
if [[ $DEV != true && ! -f "$ENTRY_FILE" ]]; then
|
||||
echo "error: Entry file $ENTRY_FILE does not exist. If you use another file as your entry point, pass ENTRY_FILE=myindex.js" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# Find path to Node
|
||||
# shellcheck source=/dev/null
|
||||
source "$RN_DIR/scripts/find-node.sh"
|
||||
source "$REACT_NATIVE_DIR/scripts/find-node.sh"
|
||||
|
||||
# check and assign NODE_BINARY env
|
||||
# shellcheck source=/dev/null
|
||||
|
||||
@@ -65,7 +65,7 @@ def use_react_native! (options={})
|
||||
|
||||
if hermes_enabled
|
||||
pod 'React-hermes', :path => "#{prefix}/ReactCommon/hermes"
|
||||
pod 'hermes-engine'
|
||||
pod 'hermes-engine', '~> 0.9.0'
|
||||
pod 'libevent', '~> 2.1.12'
|
||||
end
|
||||
end
|
||||
@@ -212,3 +212,38 @@ bash -l -c '#{env_vars} $\{PODS_TARGET_SRCROOT\}/#{prefix}/scripts/generate-spec
|
||||
:show_env_vars_in_log => true
|
||||
}
|
||||
end
|
||||
|
||||
# This provides a post_install workaround for build issues related Xcode 12.5 and Apple Silicon (M1) machines.
|
||||
# Call this in the app's main Podfile's post_install hook.
|
||||
# See https://github.com/facebook/react-native/issues/31480#issuecomment-902912841 for more context.
|
||||
# Actual fix was authored by https://github.com/mikehardy.
|
||||
# New app template will call this for now until the underlying issue is resolved.
|
||||
def __apply_Xcode_12_5_M1_post_install_workaround(installer)
|
||||
# Apple Silicon builds require a library path tweak for Swift library discovery to resolve Swift-related "symbol not found".
|
||||
# Note: this was fixed via https://github.com/facebook/react-native/commit/eb938863063f5535735af2be4e706f70647e5b90
|
||||
# Keeping this logic here but commented out for future reference.
|
||||
#
|
||||
# installer.aggregate_targets.each do |aggregate_target|
|
||||
# aggregate_target.user_project.native_targets.each do |target|
|
||||
# target.build_configurations.each do |config|
|
||||
# config.build_settings['LIBRARY_SEARCH_PATHS'] = ['$(SDKROOT)/usr/lib/swift', '$(inherited)']
|
||||
# end
|
||||
# end
|
||||
# aggregate_target.user_project.save
|
||||
# end
|
||||
|
||||
# Flipper podspecs are still targeting an older iOS deployment target, and may cause an error like:
|
||||
# "error: thread-local storage is not supported for the current target"
|
||||
# The most reliable known workaround is to bump iOS deployment target to match react-native (iOS 11 now).
|
||||
installer.pods_project.targets.each do |target|
|
||||
target.build_configurations.each do |config|
|
||||
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
|
||||
end
|
||||
end
|
||||
|
||||
# But... doing so caused another issue in Flipper:
|
||||
# "Time.h:52:17: error: typedef redefinition with different types"
|
||||
# We need to make a patch to RCT-Folly - set `__IPHONE_10_0` to our iOS target + 1.
|
||||
# See https://github.com/facebook/flipper/issues/834 for more details.
|
||||
`sed -i -e $'s/__IPHONE_10_0/__IPHONE_12_0/' #{installer.sandbox.root}/RCT-Folly/folly/portability/Time.h`
|
||||
end
|
||||
|
||||
+41
-13
@@ -4,8 +4,6 @@
|
||||
# This source code is licensed under the MIT license found in the
|
||||
# LICENSE file in the root directory of this source tree.
|
||||
|
||||
JAVA_VERSION="1.7"
|
||||
|
||||
RED="\033[0;31m"
|
||||
GREEN="\033[0;32m"
|
||||
BLUE="\033[0;35m"
|
||||
@@ -49,28 +47,55 @@ lsof -i :8081 | grep LISTEN | /usr/bin/awk '{print $2}' | xargs kill
|
||||
info "Start the packager in another terminal by running 'npm start' from the root"
|
||||
info "and then press any key."
|
||||
info ""
|
||||
read -n 1
|
||||
read -r -n 1
|
||||
|
||||
./gradlew :packages:rn-tester:android:app:installJscDebug || error "Couldn't build RNTester Android"
|
||||
|
||||
info "Press any key to run RNTester in an already running Android emulator/device"
|
||||
info ""
|
||||
read -n 1
|
||||
read -r -n 1
|
||||
adb shell am start -n com.facebook.react.uiapp/.RNTesterActivity
|
||||
|
||||
success "Installing CocoaPods dependencies"
|
||||
|
||||
info "Once done testing, keep emulator running"
|
||||
info "Press any key to run RNTester on Android with Hermes enabled"
|
||||
read -r -n 1
|
||||
|
||||
./gradlew :packages:rn-tester:android:app:installHermesDebug || error "Couldn't build RNTester Android"
|
||||
adb shell am start -n com.facebook.react.uiapp/.RNTesterActivity
|
||||
|
||||
info "When done testing RNTester on Android,"
|
||||
info "Press any key to start testing RNTester in iOS"
|
||||
read -r -n 1
|
||||
|
||||
success "About to test iOS JSC... "
|
||||
success "Installing CocoaPods dependencies..."
|
||||
rm -rf packages/rn-tester/Pods
|
||||
(cd packages/rn-tester && pod install)
|
||||
|
||||
info "Press any key to open the workspace in Xcode, then build and test manually."
|
||||
info ""
|
||||
read -n 1
|
||||
read -r -n 1
|
||||
|
||||
open "packages/rn-tester/RNTesterPods.xcworkspace"
|
||||
|
||||
info "When done testing iOS JSC, press any key to test iOS Hermes"
|
||||
read -r -n 1
|
||||
|
||||
success "About to test iOS Hermes... "
|
||||
success "Installing CocoaPods dependencies..."
|
||||
rm -rf packages/rn-tester/Pods
|
||||
(cd packages/rn-tester && USE_HERMES=1 pod install)
|
||||
|
||||
info "Press any key to open the workspace in Xcode, then build and test manually."
|
||||
info ""
|
||||
read -r -n 1
|
||||
|
||||
open "packages/rn-tester/RNTesterPods.xcworkspace"
|
||||
|
||||
info "When done testing RNTester app on iOS and Android press any key to continue."
|
||||
info ""
|
||||
read -n 1
|
||||
read -r -n 1
|
||||
|
||||
success "Killing packager"
|
||||
lsof -i :8081 | grep LISTEN
|
||||
@@ -78,20 +103,23 @@ lsof -i :8081 | grep LISTEN | /usr/bin/awk '{print $2}' | xargs kill
|
||||
|
||||
npm pack
|
||||
|
||||
PACKAGE=$(pwd)/react-native-$PACKAGE_VERSION.tgz
|
||||
TIMESTAMP=$(date +%s)
|
||||
PACKAGE=$(pwd)/react-native-$PACKAGE_VERSION-$TIMESTAMP.tgz
|
||||
success "Package bundled ($PACKAGE)"
|
||||
|
||||
mv "$(pwd)/react-native-$PACKAGE_VERSION.tgz" "$PACKAGE"
|
||||
|
||||
node scripts/set-rn-template-version.js "file:$PACKAGE"
|
||||
success "React Native version changed in the template"
|
||||
|
||||
project_name="RNTestProject"
|
||||
|
||||
cd /tmp/
|
||||
cd /tmp/ || exit
|
||||
rm -rf "$project_name"
|
||||
node "$repo_root/cli.js" init "$project_name" --template "$repo_root"
|
||||
|
||||
info "Double checking the versions in package.json are correct:"
|
||||
grep "\"react-native\": \".*react-native-$PACKAGE_VERSION.tgz\"" "/tmp/${project_name}/package.json" || error "Incorrect version number in /tmp/${project_name}/package.json"
|
||||
grep "\"react-native\": \".*react-native-$PACKAGE_VERSION-$TIMESTAMP.tgz\"" "/tmp/${project_name}/package.json" || error "Incorrect version number in /tmp/${project_name}/package.json"
|
||||
grep -E "com.facebook.react:react-native:\\+" "${project_name}/android/app/build.gradle" || error "Dependency in /tmp/${project_name}/android/app/build.gradle must be com.facebook.react:react-native:+"
|
||||
|
||||
success "New sample project generated at /tmp/${project_name}"
|
||||
@@ -102,7 +130,7 @@ info " - Verify 'Reload JS' works"
|
||||
info ""
|
||||
info "Press any key to run the sample in Android emulator/device"
|
||||
info ""
|
||||
read -n 1
|
||||
read -r -n 1
|
||||
cd "/tmp/${project_name}" && npx react-native run-android
|
||||
|
||||
info "Test the following on iOS:"
|
||||
@@ -115,10 +143,10 @@ info " - Disable Fast Refresh."
|
||||
info ""
|
||||
info "Press any key to open the project in Xcode"
|
||||
info ""
|
||||
read -n 1
|
||||
read -r -n 1
|
||||
open "/tmp/${project_name}/ios/${project_name}.xcworkspace"
|
||||
|
||||
cd "$repo_root"
|
||||
cd "$repo_root" || exit
|
||||
|
||||
info "Next steps:"
|
||||
info " - https://github.com/facebook/react-native/blob/HEAD/Releases.md"
|
||||
|
||||
Executable
+41
@@ -0,0 +1,41 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) Facebook, Inc. and its affiliates.
|
||||
#
|
||||
# This source code is licensed under the MIT license found in the
|
||||
# LICENSE file in the root directory of this source tree.
|
||||
|
||||
# This script updates RNTester Podfile.lock after verifying the CocoaPods environment.
|
||||
# Usage:
|
||||
# source scripts/update_podfile_lock && update_pods
|
||||
|
||||
THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
|
||||
RNTESTER_DIR="$THIS_DIR/../packages/rn-tester"
|
||||
|
||||
# Note: Keep in sync with FB internal.
|
||||
REQUIRED_COCOAPODS_VERSION="1.10.1"
|
||||
|
||||
validate_env () {
|
||||
# Check that CocoaPods is working.
|
||||
if [ -z "$(command -v pod)" ]; then
|
||||
echo "You need to install CocoaPods."
|
||||
echo "See https://guides.cocoapods.org/using/getting-started.html#getting-started for instructions."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
COCOAPODS_VERSION=$(pod --version)
|
||||
if [[ "$COCOAPODS_VERSION" != "$REQUIRED_COCOAPODS_VERSION" ]];
|
||||
then
|
||||
echo "You must have CocoaPods $REQUIRED_COCOAPODS_VERSION installed; you have $COCOAPODS_VERSION."
|
||||
echo "Installing via gem is recommended:"
|
||||
echo " sudo gem install cocoapods -v $REQUIRED_COCOAPODS_VERSION"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
update_pods () {
|
||||
validate_env
|
||||
|
||||
cd "$RNTESTER_DIR" || exit
|
||||
pod install
|
||||
cd "$THIS_DIR" || exit
|
||||
}
|
||||
@@ -435,10 +435,10 @@
|
||||
"$(inherited)",
|
||||
);
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"\"$(SDKROOT)/usr/lib/swift\"",
|
||||
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
|
||||
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
|
||||
"\"$(inherited)\"",
|
||||
"\"$(SDKROOT)/usr/lib/swift\"",
|
||||
);
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
@@ -493,10 +493,10 @@
|
||||
"$(inherited)",
|
||||
);
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"\"$(SDKROOT)/usr/lib/swift\"",
|
||||
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
|
||||
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
|
||||
"\"$(inherited)\"",
|
||||
"\"$(SDKROOT)/usr/lib/swift\"",
|
||||
);
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
SDKROOT = iphoneos;
|
||||
|
||||
@@ -25,5 +25,6 @@ target 'HelloWorld' do
|
||||
|
||||
post_install do |installer|
|
||||
react_native_post_install(installer)
|
||||
__apply_Xcode_12_5_M1_post_install_workaround(installer)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"react": "17.0.2",
|
||||
"react-native": "1000.0.0"
|
||||
"react-native": "0.66.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.12.9",
|
||||
@@ -21,7 +21,6 @@
|
||||
"eslint": "7.14.0",
|
||||
"jest": "^26.6.3",
|
||||
"metro-react-native-babel-preset": "^0.66.2",
|
||||
"react-native-codegen": "^0.0.7",
|
||||
"react-test-renderer": "17.0.2"
|
||||
},
|
||||
"jest": {
|
||||
|
||||
@@ -3,15 +3,18 @@
|
||||
# This source code is licensed under the MIT license found in the
|
||||
# LICENSE file in the root directory of this source tree.
|
||||
|
||||
folly_release_version = '2021.06.28.00'
|
||||
|
||||
Pod::Spec.new do |spec|
|
||||
spec.name = 'RCT-Folly'
|
||||
spec.version = '2021.06.28.00'
|
||||
# Patched to v2 to address https://github.com/react-native-community/releases/issues/251
|
||||
spec.version = folly_release_version + '-v2'
|
||||
spec.license = { :type => 'Apache License, Version 2.0' }
|
||||
spec.homepage = 'https://github.com/facebook/folly'
|
||||
spec.summary = 'An open-source C++ library developed and used at Facebook.'
|
||||
spec.authors = 'Facebook'
|
||||
spec.source = { :git => 'https://github.com/facebook/folly.git',
|
||||
:tag => "v#{spec.version}" }
|
||||
:tag => "v#{folly_release_version}" }
|
||||
spec.module_name = 'folly'
|
||||
spec.header_mappings_dir = '.'
|
||||
spec.dependency 'boost'
|
||||
@@ -69,7 +72,7 @@ Pod::Spec.new do |spec|
|
||||
'folly/net/*.h',
|
||||
'folly/net/detail/*.h',
|
||||
'folly/portability/*.h'
|
||||
spec.libraries = "stdc++"
|
||||
spec.libraries = "stdc++", "c++abi" # NOTE Apple-only: Keep c++abi here due to https://github.com/react-native-community/releases/issues/251
|
||||
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
|
||||
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
|
||||
"HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include/\"" }
|
||||
|
||||
@@ -1103,6 +1103,26 @@
|
||||
sudo-prompt "^9.0.0"
|
||||
wcwidth "^1.0.1"
|
||||
|
||||
"@react-native-community/eslint-plugin@*":
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/@react-native-community/eslint-plugin/-/eslint-plugin-1.1.0.tgz#e42b1bef12d2415411519fd528e64b593b1363dc"
|
||||
integrity sha512-W/J0fNYVO01tioHjvYWQ9m6RgndVtbElzYozBq1ZPrHO/iCzlqoySHl4gO/fpCl9QEFjvJfjPgtPMTMlsoq5DQ==
|
||||
|
||||
"@react-native/assets@1.0.0":
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/@react-native/assets/-/assets-1.0.0.tgz#c6f9bf63d274bafc8e970628de24986b30a55c8e"
|
||||
integrity sha512-KrwSpS1tKI70wuKl68DwJZYEvXktDHdZMG0k2AXD/rJVSlB23/X2CB2cutVR0HwNMJIal9HOUOBB2rVfa6UGtQ==
|
||||
|
||||
"@react-native/normalize-color@1.0.0":
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/@react-native/normalize-color/-/normalize-color-1.0.0.tgz#c52a99d4fe01049102d47dc45d40cbde4f720ab6"
|
||||
integrity sha512-xUNRvNmCl3UGCPbbHvfyFMnpvLPoOjDCcp5bT9m2k+TF/ZBklEQwhPZlkrxRx2NhgFh1X3a5uL7mJ7ZR+8G7Qg==
|
||||
|
||||
"@react-native/polyfills@2.0.0":
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/@react-native/polyfills/-/polyfills-2.0.0.tgz#4c40b74655c83982c8cf47530ee7dc13d957b6aa"
|
||||
integrity sha512-K0aGNn1TjalKj+65D7ycc1//H9roAQ51GJVk5ZJQFb2teECGmzd86bYDC0aYdbRf7gtovescq4Zt6FR0tgXiHQ==
|
||||
|
||||
"@reactions/component@^2.0.2":
|
||||
version "2.0.2"
|
||||
resolved "https://registry.yarnpkg.com/@reactions/component/-/component-2.0.2.tgz#40f8c1c2c37baabe57a0c944edb9310dc1ec6642"
|
||||
@@ -3297,10 +3317,10 @@ has@^1.0.3:
|
||||
dependencies:
|
||||
function-bind "^1.1.1"
|
||||
|
||||
hermes-engine@~0.8.0:
|
||||
version "0.8.0"
|
||||
resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.8.0.tgz#d8e507fbfda66f6bd604f79503b45fded1163296"
|
||||
integrity sha512-bFxAnIjE8M3cco1uh4HlHME8qmOsPcVS75bQoo/fM3wUzMYxZBL0s1IfePUO+R9IUKoO+pfIpjV2I9ay8w7mqw==
|
||||
hermes-engine@~0.9.0:
|
||||
version "0.9.0"
|
||||
resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.9.0.tgz#84d9cfe84e8f6b1b2020d6e71b350cec84ed982f"
|
||||
integrity sha512-r7U+Y4P2Qg/igFVZN+DpT7JFfXUn1MM4dFne8aW+cCrF6RRymof+VqrUHs1kl07j8h8V2CNesU19RKgWbr3qPw==
|
||||
|
||||
hermes-parser@0.4.7:
|
||||
version "0.4.7"
|
||||
@@ -5583,6 +5603,15 @@ react-is@^16.8.1, react-is@^16.8.4:
|
||||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
|
||||
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
|
||||
|
||||
react-native-codegen@^0.0.7:
|
||||
version "0.0.7"
|
||||
resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.7.tgz#86651c5c5fec67a8077ef7f4e36f7ed459043e14"
|
||||
integrity sha512-dwNgR8zJ3ALr480QnAmpTiqvFo+rDtq6V5oCggKhYFlRjzOmVSFn3YD41u8ltvKS5G2nQ8gCs2vReFFnRGLYng==
|
||||
dependencies:
|
||||
flow-parser "^0.121.0"
|
||||
jscodeshift "^0.11.0"
|
||||
nullthrows "^1.1.1"
|
||||
|
||||
react-refresh@^0.4.0:
|
||||
version "0.4.0"
|
||||
resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.0.tgz#d421f9bd65e0e4b9822a399f14ac56bda9c92292"
|
||||
@@ -6182,13 +6211,6 @@ source-map-resolve@^0.5.0:
|
||||
source-map-url "^0.4.0"
|
||||
urix "^0.1.0"
|
||||
|
||||
source-map-support@0.5.0:
|
||||
version "0.5.0"
|
||||
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab"
|
||||
integrity sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q==
|
||||
dependencies:
|
||||
source-map "^0.6.0"
|
||||
|
||||
source-map-support@^0.5.16, source-map-support@^0.5.6:
|
||||
version "0.5.16"
|
||||
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
|
||||
|
||||
Reference in New Issue
Block a user