Skip to content

Remove comment on merging stable branches -> main #1595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Remove comment on merging stable branches -> main #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Libraries/Core/ReactNativeVersion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions React/Base/RCTVersion.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Object> VERSION = MapBuilder.<String, Object>of(
"major", 0,
Expand Down
4 changes: 0 additions & 4 deletions ReactCommon/cxxreact/ReactNativeVersion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions scripts/versiontemplates/RCTVersion.m.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions scripts/versiontemplates/ReactNativeVersion.h.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
4 changes: 0 additions & 4 deletions scripts/versiontemplates/ReactNativeVersion.java.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Object> VERSION = MapBuilder.<String, Object>of(
"major", ${major},
Expand Down
4 changes: 0 additions & 4 deletions scripts/versiontemplates/ReactNativeVersion.js.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down