From 35cb2985058b9cf1f4b040a4989b41964e72a9b8 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Sun, 9 Jan 2022 03:36:19 -0600 Subject: [PATCH 1/5] Revert "[0.63.3] Bump version numbers" This reverts commit 7100756bb8b0b1ac85ccaa32c0ce5c1cc70d524f. --- Libraries/Core/ReactNativeVersion.js | 4 ++-- React/Base/RCTVersion.m | 4 ++-- ReactAndroid/gradle.properties | 3 +-- .../facebook/react/modules/systeminfo/ReactNativeVersion.java | 4 ++-- ReactCommon/cxxreact/ReactNativeVersion.h | 4 ++-- template/package.json | 3 ++- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js index 0a6de3d068056a..db37c680973867 100644 --- a/Libraries/Core/ReactNativeVersion.js +++ b/Libraries/Core/ReactNativeVersion.js @@ -11,7 +11,7 @@ exports.version = { major: 0, - minor: 63, - patch: 3, + minor: 0, + patch: 0, prerelease: null, }; diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m index d601aa96cf91b0..8d1a6a2cd953f1 100644 --- a/React/Base/RCTVersion.m +++ b/React/Base/RCTVersion.m @@ -22,8 +22,8 @@ dispatch_once(&onceToken, ^(void){ __rnVersion = @{ RCTVersionMajor: @(0), - RCTVersionMinor: @(63), - RCTVersionPatch: @(3), + RCTVersionMinor: @(0), + RCTVersionPatch: @(0), RCTVersionPrerelease: [NSNull null], }; }); diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index d81ac6b7997a8e..1939f095ceb497 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -1,5 +1,4 @@ -# TODO :: ANDROID patch to stay consistant with the npm version. -VERSION_NAME=0.63.3 +VERSION_NAME=1000.0.0-main 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 bf6fbe801cae0c..6278912404c943 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 @@ -16,7 +16,7 @@ public class ReactNativeVersion { public static final Map VERSION = MapBuilder.of( "major", 0, - "minor", 63, - "patch", 3, + "minor", 0, + "patch", 0, "prerelease", null); } diff --git a/ReactCommon/cxxreact/ReactNativeVersion.h b/ReactCommon/cxxreact/ReactNativeVersion.h index 6e48cf86dbb3a3..d6cbbcd82a9c6d 100644 --- a/ReactCommon/cxxreact/ReactNativeVersion.h +++ b/ReactCommon/cxxreact/ReactNativeVersion.h @@ -16,8 +16,8 @@ namespace facebook::react { constexpr struct { int32_t Major = 0; - int32_t Minor = 63; - int32_t Patch = 3; + int32_t Minor = 0; + int32_t Patch = 0; std::string_view Prerelease = ""; } ReactNativeVersion; diff --git a/template/package.json b/template/package.json index 351a586f2318f9..f7bddc8ed43388 100644 --- a/template/package.json +++ b/template/package.json @@ -5,13 +5,14 @@ "scripts": { "android": "react-native run-android", "ios": "react-native run-ios", + "macos": "react-native run-macos", "start": "react-native start", "test": "jest", "lint": "eslint ." }, "dependencies": { "react": "17.0.1", - "react-native": "0.63.3" + "react-native": "1000.0.0" }, "devDependencies": { "@babel/core": "^7.8.4", From ac56e9906d9be15d9996a3cf620e1007123c85fe Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Sun, 9 Jan 2022 04:03:53 -0600 Subject: [PATCH 2/5] react-native->react-native-macos --- template/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index f7bddc8ed43388..11f912c36613c8 100644 --- a/template/package.json +++ b/template/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "react": "17.0.1", - "react-native": "1000.0.0" + "react-native-macos": "1000.0.0" }, "devDependencies": { "@babel/core": "^7.8.4", From e13a0057925914cf31c857ba5b81a889561b950c Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Fri, 4 Feb 2022 10:56:04 -0600 Subject: [PATCH 3/5] test undoing template change once more --- template/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index cafc838a718f0c..1314b2584cc2cc 100644 --- a/template/package.json +++ b/template/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "react": "17.0.2", - "react-native-macos": "1000.0.0" + "react-native": "1000.0.0" }, "devDependencies": { "@babel/core": "^7.12.9", From de882d046ead7a6aae430e15b883daae1d5fead9 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Fri, 4 Feb 2022 11:08:07 -0600 Subject: [PATCH 4/5] Add back template change. --- template/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/package.json b/template/package.json index 1314b2584cc2cc..cafc838a718f0c 100644 --- a/template/package.json +++ b/template/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "react": "17.0.2", - "react-native": "1000.0.0" + "react-native-macos": "1000.0.0" }, "devDependencies": { "@babel/core": "^7.12.9", From 50b57c93a73019c63e4b11af37aeca6f387fe679 Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Fri, 4 Feb 2022 13:18:38 -0600 Subject: [PATCH 5/5] add comments --- Libraries/Core/ReactNativeVersion.js | 5 +++++ React/Base/RCTVersion.m | 7 +++++-- .../react/modules/systeminfo/ReactNativeVersion.java | 4 ++++ ReactCommon/cxxreact/ReactNativeVersion.h | 4 ++++ scripts/versiontemplates/RCTVersion.m.template | 4 ++++ scripts/versiontemplates/ReactNativeVersion.h.template | 4 ++++ scripts/versiontemplates/ReactNativeVersion.java.template | 4 ++++ scripts/versiontemplates/ReactNativeVersion.js.template | 4 ++++ 8 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js index db37c680973867..2f62979ecdbd45 100644 --- a/Libraries/Core/ReactNativeVersion.js +++ b/Libraries/Core/ReactNativeVersion.js @@ -9,6 +9,11 @@ * @flow strict */ + +// [TODO(macOS GH#944) +// Note: Be careful not to override these version numbers +// when we merge upstream stable branches into main +// TODO(macOS GH#944)] exports.version = { major: 0, minor: 0, diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m index cb38957f24f942..afdb975b20cbf5 100644 --- a/React/Base/RCTVersion.m +++ b/React/Base/RCTVersion.m @@ -14,7 +14,10 @@ NSString* const RCTVersionPatch = @"patch"; NSString* const RCTVersionPrerelease = @"prerelease"; - +// [TODO(macOS GH#944) +// Note: Be careful not to override these version numbers +// when we merge upstream stable branches into main +// TODO(macOS GH#944)] NSDictionary* RCTGetReactNativeVersion(void) { static NSDictionary* __rnVersion; @@ -22,7 +25,7 @@ dispatch_once(&onceToken, ^(void){ __rnVersion = @{ RCTVersionMajor: @(0), - RCTVersionMinor: @(66), + RCTVersionMinor: @(0), RCTVersionPatch: @(0), RCTVersionPrerelease: [NSNull null], }; 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 6278912404c943..7fbaf3b0781129 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 @@ -13,6 +13,10 @@ import java.util.Map; +// [TODO(macOS GH#944) +// Note: Be careful not to override these version numbers +// when we merge upstream stable branches into main +// TODO(macOS GH#944)] public class ReactNativeVersion { public static final Map VERSION = MapBuilder.of( "major", 0, diff --git a/ReactCommon/cxxreact/ReactNativeVersion.h b/ReactCommon/cxxreact/ReactNativeVersion.h index d6cbbcd82a9c6d..4627926ac16766 100644 --- a/ReactCommon/cxxreact/ReactNativeVersion.h +++ b/ReactCommon/cxxreact/ReactNativeVersion.h @@ -14,6 +14,10 @@ namespace facebook::react { +// [TODO(macOS GH#944) +// Note: Be careful not to override these version numbers +// when we merge upstream stable branches into main +// TODO(macOS GH#944)] constexpr struct { int32_t Major = 0; int32_t Minor = 0; diff --git a/scripts/versiontemplates/RCTVersion.m.template b/scripts/versiontemplates/RCTVersion.m.template index 5df4b8fabdb477..ee783d0106b6f4 100644 --- a/scripts/versiontemplates/RCTVersion.m.template +++ b/scripts/versiontemplates/RCTVersion.m.template @@ -15,6 +15,10 @@ NSString* const RCTVersionPatch = @"patch"; NSString* const RCTVersionPrerelease = @"prerelease"; +// [TODO(macOS GH#944) +// Note: Be careful not to override these version numbers +// when we merge upstream stable branches into main +// TODO(macOS GH#944)] NSDictionary* RCTGetReactNativeVersion(void) { static NSDictionary* __rnVersion; diff --git a/scripts/versiontemplates/ReactNativeVersion.h.template b/scripts/versiontemplates/ReactNativeVersion.h.template index ed9d242c72a43d..2b4b584e93a2d6 100644 --- a/scripts/versiontemplates/ReactNativeVersion.h.template +++ b/scripts/versiontemplates/ReactNativeVersion.h.template @@ -14,6 +14,10 @@ namespace facebook::react { +// [TODO(macOS GH#944) +// Note: Be careful not to override these version numbers +// when we merge upstream stable branches into main +// TODO(macOS GH#944)] constexpr struct { int32_t Major = ${major}; int32_t Minor = ${minor}; diff --git a/scripts/versiontemplates/ReactNativeVersion.java.template b/scripts/versiontemplates/ReactNativeVersion.java.template index 94d103f10002a9..6134b9f3969c32 100644 --- a/scripts/versiontemplates/ReactNativeVersion.java.template +++ b/scripts/versiontemplates/ReactNativeVersion.java.template @@ -13,6 +13,10 @@ import com.facebook.react.common.MapBuilder; import java.util.Map; +// [TODO(macOS GH#944) +// Note: Be careful not to override these version numbers +// when we merge upstream stable branches into main +// TODO(macOS GH#944)] public class ReactNativeVersion { public static final Map VERSION = MapBuilder.of( "major", ${major}, diff --git a/scripts/versiontemplates/ReactNativeVersion.js.template b/scripts/versiontemplates/ReactNativeVersion.js.template index 72bfcfef110580..a2ceea7dc227e2 100644 --- a/scripts/versiontemplates/ReactNativeVersion.js.template +++ b/scripts/versiontemplates/ReactNativeVersion.js.template @@ -9,6 +9,10 @@ * @flow strict */ +// [TODO(macOS GH#944) +// Note: Be careful not to override these version numbers +// when we merge upstream stable branches into main +// TODO(macOS GH#944)] exports.version = { major: ${major}, minor: ${minor},