From 5242586d9c579531a18fa96f2e0d383d1209ba7a Mon Sep 17 00:00:00 2001 From: Saad Najmi Date: Mon, 19 Dec 2022 12:18:19 -0600 Subject: [PATCH] Remove comment on merging stable branches -> main --- Libraries/Core/ReactNativeVersion.js | 5 ----- React/Base/RCTVersion.m | 4 ---- .../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, 33 deletions(-) diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js index c0bb6a7e528fbf..4c88c46d837164 100644 --- a/Libraries/Core/ReactNativeVersion.js +++ b/Libraries/Core/ReactNativeVersion.js @@ -9,11 +9,6 @@ * @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 02caaa0a5e42b1..b09a214400df96 100644 --- a/React/Base/RCTVersion.m +++ b/React/Base/RCTVersion.m @@ -14,10 +14,6 @@ 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/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java index 9155cb8b5e382d..d42743752bb9c5 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,10 +13,6 @@ 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 cc15fe21a3f061..631530267251ce 100644 --- a/ReactCommon/cxxreact/ReactNativeVersion.h +++ b/ReactCommon/cxxreact/ReactNativeVersion.h @@ -14,10 +14,6 @@ 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 002b5264d40ace..f79d3fae1d8477 100644 --- a/scripts/versiontemplates/RCTVersion.m.template +++ b/scripts/versiontemplates/RCTVersion.m.template @@ -15,10 +15,6 @@ 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 959efd0bff75bf..884df9f3fd044a 100644 --- a/scripts/versiontemplates/ReactNativeVersion.h.template +++ b/scripts/versiontemplates/ReactNativeVersion.h.template @@ -14,10 +14,6 @@ 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 675354b8eb830e..860764317f139f 100644 --- a/scripts/versiontemplates/ReactNativeVersion.java.template +++ b/scripts/versiontemplates/ReactNativeVersion.java.template @@ -13,10 +13,6 @@ 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 278ee304e3e045..b24f93b25c1491 100644 --- a/scripts/versiontemplates/ReactNativeVersion.js.template +++ b/scripts/versiontemplates/ReactNativeVersion.js.template @@ -9,10 +9,6 @@ * @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},