Skip to content

Remove hardcoded 0.6x.x version numbers from main branch #944

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.

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 8 commits into from
Feb 7, 2022
Merged
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion Libraries/Core/ReactNativeVersion.js
Original file line number Diff line number Diff line change
@@ -9,9 +9,14 @@
* @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: 66,
minor: 0,
patch: 0,
prerelease: null,
};
7 changes: 5 additions & 2 deletions React/Base/RCTVersion.m
Original file line number Diff line number Diff line change
@@ -14,15 +14,18 @@
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;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^(void){
__rnVersion = @{
RCTVersionMajor: @(0),
RCTVersionMinor: @(66),
RCTVersionMinor: @(0),
RCTVersionPatch: @(0),
RCTVersionPrerelease: [NSNull null],
};
Original file line number Diff line number Diff line change
@@ -13,10 +13,14 @@

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,
"minor", 66,
"minor", 0,
"patch", 0,
"prerelease", null);
}
6 changes: 5 additions & 1 deletion ReactCommon/cxxreact/ReactNativeVersion.h
Original file line number Diff line number Diff line change
@@ -14,9 +14,13 @@

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 = 66;
int32_t Minor = 0;
int32_t Patch = 0;
std::string_view Prerelease = "";
} ReactNativeVersion;
4 changes: 4 additions & 0 deletions scripts/versiontemplates/RCTVersion.m.template
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 4 additions & 0 deletions scripts/versiontemplates/ReactNativeVersion.h.template
Original file line number Diff line number Diff line change
@@ -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};
4 changes: 4 additions & 0 deletions scripts/versiontemplates/ReactNativeVersion.java.template
Original file line number Diff line number Diff line change
@@ -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<String, Object> VERSION = MapBuilder.<String, Object>of(
"major", ${major},
4 changes: 4 additions & 0 deletions scripts/versiontemplates/ReactNativeVersion.js.template
Original file line number Diff line number Diff line change
@@ -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},
3 changes: 2 additions & 1 deletion template/package.json
Original file line number Diff line number Diff line change
@@ -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.2",
"react-native": "0.66.0"
"react-native-macos": "1000.0.0"
},
"devDependencies": {
"@babel/core": "^7.12.9",