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.

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 8 commits into from
Feb 7, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35cb298
Revert "[0.63.3] Bump version numbers"
Saadnajmi Jan 9, 2022
ac56e99
react-native->react-native-macos
Saadnajmi Jan 9, 2022
47663ec
Merge branch 'main' of git://github.com/microsoft/react-native-macos …
Saadnajmi Jan 15, 2022
9cdd0e3
Merge branch 'main' of git://github.com/microsoft/react-native-macos …
Saadnajmi Feb 4, 2022
e13a005
test undoing template change once more
Saadnajmi Feb 4, 2022
de882d0
Add back template change.
Saadnajmi Feb 4, 2022
50b57c9
add comments
Saadnajmi Feb 4, 2022
9477766
Merge branch 'main' of git://github.com/microsoft/react-native-macos …
Saadnajmi Feb 7, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
};
Expand Down
6 changes: 5 additions & 1 deletion 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,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions scripts/versiontemplates/RCTVersion.m.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions scripts/versiontemplates/ReactNativeVersion.h.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
4 changes: 4 additions & 0 deletions scripts/versiontemplates/ReactNativeVersion.java.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
4 changes: 4 additions & 0 deletions scripts/versiontemplates/ReactNativeVersion.js.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
3 changes: 2 additions & 1 deletion template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down