Skip to content

Commit cf2105f

Browse files
authored
Remove hardcoded 0.6x.x version numbers from main branch (#944)
* Revert "[0.63.3] Bump version numbers" This reverts commit 7100756. * react-native->react-native-macos * test undoing template change once more * Add back template change. * add comments
1 parent 5c51f7d commit cf2105f

File tree

9 files changed

+39
-6
lines changed

9 files changed

+39
-6
lines changed

Libraries/Core/ReactNativeVersion.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@
99
* @flow strict
1010
*/
1111

12+
13+
// [TODO(macOS GH#944)
14+
// Note: Be careful not to override these version numbers
15+
// when we merge upstream stable branches into main
16+
// TODO(macOS GH#944)]
1217
exports.version = {
1318
major: 0,
14-
minor: 66,
19+
minor: 0,
1520
patch: 0,
1621
prerelease: null,
1722
};

React/Base/RCTVersion.m

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,18 @@
1414
NSString* const RCTVersionPatch = @"patch";
1515
NSString* const RCTVersionPrerelease = @"prerelease";
1616

17-
17+
// [TODO(macOS GH#944)
18+
// Note: Be careful not to override these version numbers
19+
// when we merge upstream stable branches into main
20+
// TODO(macOS GH#944)]
1821
NSDictionary* RCTGetReactNativeVersion(void)
1922
{
2023
static NSDictionary* __rnVersion;
2124
static dispatch_once_t onceToken;
2225
dispatch_once(&onceToken, ^(void){
2326
__rnVersion = @{
2427
RCTVersionMajor: @(0),
25-
RCTVersionMinor: @(66),
28+
RCTVersionMinor: @(0),
2629
RCTVersionPatch: @(0),
2730
RCTVersionPrerelease: [NSNull null],
2831
};

ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@
1313

1414
import java.util.Map;
1515

16+
// [TODO(macOS GH#944)
17+
// Note: Be careful not to override these version numbers
18+
// when we merge upstream stable branches into main
19+
// TODO(macOS GH#944)]
1620
public class ReactNativeVersion {
1721
public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
1822
"major", 0,
19-
"minor", 66,
23+
"minor", 0,
2024
"patch", 0,
2125
"prerelease", null);
2226
}

ReactCommon/cxxreact/ReactNativeVersion.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414

1515
namespace facebook::react {
1616

17+
// [TODO(macOS GH#944)
18+
// Note: Be careful not to override these version numbers
19+
// when we merge upstream stable branches into main
20+
// TODO(macOS GH#944)]
1721
constexpr struct {
1822
int32_t Major = 0;
19-
int32_t Minor = 66;
23+
int32_t Minor = 0;
2024
int32_t Patch = 0;
2125
std::string_view Prerelease = "";
2226
} ReactNativeVersion;

scripts/versiontemplates/RCTVersion.m.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ NSString* const RCTVersionPatch = @"patch";
1515
NSString* const RCTVersionPrerelease = @"prerelease";
1616

1717

18+
// [TODO(macOS GH#944)
19+
// Note: Be careful not to override these version numbers
20+
// when we merge upstream stable branches into main
21+
// TODO(macOS GH#944)]
1822
NSDictionary* RCTGetReactNativeVersion(void)
1923
{
2024
static NSDictionary* __rnVersion;

scripts/versiontemplates/ReactNativeVersion.h.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
namespace facebook::react {
1616

17+
// [TODO(macOS GH#944)
18+
// Note: Be careful not to override these version numbers
19+
// when we merge upstream stable branches into main
20+
// TODO(macOS GH#944)]
1721
constexpr struct {
1822
int32_t Major = ${major};
1923
int32_t Minor = ${minor};

scripts/versiontemplates/ReactNativeVersion.java.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ import com.facebook.react.common.MapBuilder;
1313

1414
import java.util.Map;
1515

16+
// [TODO(macOS GH#944)
17+
// Note: Be careful not to override these version numbers
18+
// when we merge upstream stable branches into main
19+
// TODO(macOS GH#944)]
1620
public class ReactNativeVersion {
1721
public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
1822
"major", ${major},

scripts/versiontemplates/ReactNativeVersion.js.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
* @flow strict
1010
*/
1111

12+
// [TODO(macOS GH#944)
13+
// Note: Be careful not to override these version numbers
14+
// when we merge upstream stable branches into main
15+
// TODO(macOS GH#944)]
1216
exports.version = {
1317
major: ${major},
1418
minor: ${minor},

template/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
"scripts": {
66
"android": "react-native run-android",
77
"ios": "react-native run-ios",
8+
"macos": "react-native run-macos",
89
"start": "react-native start",
910
"test": "jest",
1011
"lint": "eslint ."
1112
},
1213
"dependencies": {
1314
"react": "17.0.2",
14-
"react-native": "0.66.0"
15+
"react-native-macos": "1000.0.0"
1516
},
1617
"devDependencies": {
1718
"@babel/core": "^7.12.9",

0 commit comments

Comments
 (0)