From e4d61f3323f92cbe4dadbb56941c57862f2888b8 Mon Sep 17 00:00:00 2001 From: williamdeng Date: Mon, 27 Jul 2020 11:20:21 +0800 Subject: [PATCH 1/4] fix: a crash 'This dynamic value has been recycled' on Bugly --- .../uimanager/ViewManagersPropertyCache.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java index 9a3a798ea5..8b9e124769 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java @@ -98,14 +98,23 @@ import javax.annotation.Nullable; ReactStylesDiffMap props) { try { if (mIndex == null) { - SHADOW_ARGS[0] = extractProperty(props); - mSetter.invoke(nodeToUpdate, SHADOW_ARGS); - Arrays.fill(SHADOW_ARGS, null); + // SHADOW_ARGS[0] = extractProperty(props); + // mSetter.invoke(nodeToUpdate, SHADOW_ARGS); + // Arrays.fill(SHADOW_ARGS, null); + Object[] local_SHADOW_ARGS = new Object[SHADOW_ARGS.length]; + local_SHADOW_ARGS[0] = extractProperty(props); + mSetter.invoke(nodeToUpdate, local_SHADOW_ARGS); + Arrays.fill(local_SHADOW_ARGS, null); } else { - SHADOW_GROUP_ARGS[0] = mIndex; - SHADOW_GROUP_ARGS[1] = extractProperty(props); - mSetter.invoke(nodeToUpdate, SHADOW_GROUP_ARGS); - Arrays.fill(SHADOW_GROUP_ARGS, null); + // SHADOW_GROUP_ARGS[0] = mIndex; + // SHADOW_GROUP_ARGS[1] = extractProperty(props); + // mSetter.invoke(nodeToUpdate, SHADOW_GROUP_ARGS); + // Arrays.fill(SHADOW_GROUP_ARGS, null); + Object[] local_SHADOW_GROUP_ARGS = new Object[SHADOW_GROUP_ARGS.length]; + local_SHADOW_GROUP_ARGS[0] = mIndex; + local_SHADOW_GROUP_ARGS[1] = extractProperty(props); + mSetter.invoke(nodeToUpdate, local_SHADOW_GROUP_ARGS); + Arrays.fill(local_SHADOW_GROUP_ARGS, null); } } catch (Throwable t) { FLog.e(ViewManager.class, "Error while updating prop " + mPropName, t); -- Gitee From 28a73af388032e49b64646b791c9139075372018 Mon Sep 17 00:00:00 2001 From: williamdeng Date: Mon, 27 Jul 2020 17:04:53 +0800 Subject: [PATCH 2/4] [0.51.17-rc.01] Bump version numbers --- Libraries/Core/ReactNativeVersion.js | 4 ++-- React/Base/RCTVersion.h | 4 ++-- ReactAndroid/gradle.properties | 2 +- .../facebook/react/modules/systeminfo/ReactNativeVersion.java | 4 ++-- package.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js index 7eb6ba8981..ec83449d57 100644 --- a/Libraries/Core/ReactNativeVersion.js +++ b/Libraries/Core/ReactNativeVersion.js @@ -15,6 +15,6 @@ exports.version = { major: 0, minor: 51, - patch: 16, - prerelease: null, + patch: 17, + prerelease: 'rc.01', }; diff --git a/React/Base/RCTVersion.h b/React/Base/RCTVersion.h index 8b4e4a3494..6feafd000f 100644 --- a/React/Base/RCTVersion.h +++ b/React/Base/RCTVersion.h @@ -12,6 +12,6 @@ #define RCT_REACT_NATIVE_VERSION @{ \ @"major": @(0), \ @"minor": @(51), \ - @"patch": @(16), \ - @"prerelease": [NSNull null], \ + @"patch": @(17), \ + @"prerelease": @"rc.01", \ } diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index fbd2cacc0f..8d66cedffa 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=0.51.16 +VERSION_NAME=0.51.17-rc.01 GROUP=com.facebook.react POM_NAME=ReactNative diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java index cb5e234528..7cbb0cbdfa 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java @@ -19,6 +19,6 @@ public class ReactNativeVersion { public static final Map VERSION = MapBuilder.of( "major", 0, "minor", 51, - "patch", 16, - "prerelease", null); + "patch", 17, + "prerelease", "rc.01"); } diff --git a/package.json b/package.json index 5ed2d4bf14..30bb21f2ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native", - "version": "0.51.16", + "version": "0.51.17-rc.01", "description": "A framework for building native apps using React", "license": "BSD-3-Clause", "repository": { -- Gitee From 8a474df8a6f4134e487ac151e876629b2d08a69d Mon Sep 17 00:00:00 2001 From: williamdeng Date: Mon, 27 Jul 2020 17:06:09 +0800 Subject: [PATCH 3/4] [0.51.17-rc.1] Bump version numbers --- Libraries/Core/ReactNativeVersion.js | 4 ++-- React/Base/RCTVersion.h | 4 ++-- ReactAndroid/gradle.properties | 2 +- .../facebook/react/modules/systeminfo/ReactNativeVersion.java | 4 ++-- package.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js index 7eb6ba8981..2ef34d545e 100644 --- a/Libraries/Core/ReactNativeVersion.js +++ b/Libraries/Core/ReactNativeVersion.js @@ -15,6 +15,6 @@ exports.version = { major: 0, minor: 51, - patch: 16, - prerelease: null, + patch: 17, + prerelease: 'rc.1', }; diff --git a/React/Base/RCTVersion.h b/React/Base/RCTVersion.h index 8b4e4a3494..72e43f0d63 100644 --- a/React/Base/RCTVersion.h +++ b/React/Base/RCTVersion.h @@ -12,6 +12,6 @@ #define RCT_REACT_NATIVE_VERSION @{ \ @"major": @(0), \ @"minor": @(51), \ - @"patch": @(16), \ - @"prerelease": [NSNull null], \ + @"patch": @(17), \ + @"prerelease": @"rc.1", \ } diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index fbd2cacc0f..d3198105b2 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=0.51.16 +VERSION_NAME=0.51.17-rc.1 GROUP=com.facebook.react POM_NAME=ReactNative diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java index cb5e234528..32b31c6968 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java @@ -19,6 +19,6 @@ public class ReactNativeVersion { public static final Map VERSION = MapBuilder.of( "major", 0, "minor", 51, - "patch", 16, - "prerelease", null); + "patch", 17, + "prerelease", "rc.1"); } diff --git a/package.json b/package.json index 5ed2d4bf14..ff44f67f88 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native", - "version": "0.51.16", + "version": "0.51.17-rc.1", "description": "A framework for building native apps using React", "license": "BSD-3-Clause", "repository": { -- Gitee From 86acaa4075c4984bcd5b80cfb6ef4888bd008b4f Mon Sep 17 00:00:00 2001 From: williamdeng Date: Thu, 3 Sep 2020 20:19:10 +0800 Subject: [PATCH 4/4] [0.51.19] Bump version numbers --- Libraries/Core/ReactNativeVersion.js | 2 +- React/Base/RCTVersion.h | 2 +- ReactAndroid/gradle.properties | 2 +- .../facebook/react/modules/systeminfo/ReactNativeVersion.java | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js index d601b104d1..927dbea71e 100644 --- a/Libraries/Core/ReactNativeVersion.js +++ b/Libraries/Core/ReactNativeVersion.js @@ -15,6 +15,6 @@ exports.version = { major: 0, minor: 51, - patch: 18, + patch: 19, prerelease: null, }; diff --git a/React/Base/RCTVersion.h b/React/Base/RCTVersion.h index a7f08fea07..a1af601237 100644 --- a/React/Base/RCTVersion.h +++ b/React/Base/RCTVersion.h @@ -12,6 +12,6 @@ #define RCT_REACT_NATIVE_VERSION @{ \ @"major": @(0), \ @"minor": @(51), \ - @"patch": @(18), \ + @"patch": @(19), \ @"prerelease": [NSNull null], \ } diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index 5202940f5c..7071fb078d 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=0.51.18 +VERSION_NAME=0.51.19 GROUP=com.facebook.react POM_NAME=ReactNative diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java index 3a2c9308e9..caf3bc7354 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java @@ -19,6 +19,6 @@ public class ReactNativeVersion { public static final Map VERSION = MapBuilder.of( "major", 0, "minor", 51, - "patch", 18, + "patch", 19, "prerelease", null); } diff --git a/package.json b/package.json index 8ad4303b8f..13a581bc2c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native", - "version": "0.51.18", + "version": "0.51.19", "description": "A framework for building native apps using React", "license": "BSD-3-Clause", "repository": { -- Gitee