diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js index 243fe2b5406591..2f62979ecdbd45 100644 --- a/Libraries/Core/ReactNativeVersion.js +++ b/Libraries/Core/ReactNativeVersion.js @@ -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, }; diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m index cb38957f24f942..afdb975b20cbf5 100644 --- a/React/Base/RCTVersion.m +++ b/React/Base/RCTVersion.m @@ -14,7 +14,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; @@ -22,7 +25,7 @@ dispatch_once(&onceToken, ^(void){ __rnVersion = @{ RCTVersionMajor: @(0), - RCTVersionMinor: @(66), + RCTVersionMinor: @(0), RCTVersionPatch: @(0), RCTVersionPrerelease: [NSNull null], }; 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 3024ab3dfd41a5..7fbaf3b0781129 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,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 VERSION = MapBuilder.of( "major", 0, - "minor", 66, + "minor", 0, "patch", 0, "prerelease", null); } diff --git a/ReactCommon/cxxreact/ReactNativeVersion.h b/ReactCommon/cxxreact/ReactNativeVersion.h index e3a3377e14bd20..4627926ac16766 100644 --- a/ReactCommon/cxxreact/ReactNativeVersion.h +++ b/ReactCommon/cxxreact/ReactNativeVersion.h @@ -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; diff --git a/scripts/versiontemplates/RCTVersion.m.template b/scripts/versiontemplates/RCTVersion.m.template index 5df4b8fabdb477..ee783d0106b6f4 100644 --- a/scripts/versiontemplates/RCTVersion.m.template +++ b/scripts/versiontemplates/RCTVersion.m.template @@ -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; diff --git a/scripts/versiontemplates/ReactNativeVersion.h.template b/scripts/versiontemplates/ReactNativeVersion.h.template index ed9d242c72a43d..2b4b584e93a2d6 100644 --- a/scripts/versiontemplates/ReactNativeVersion.h.template +++ b/scripts/versiontemplates/ReactNativeVersion.h.template @@ -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}; diff --git a/scripts/versiontemplates/ReactNativeVersion.java.template b/scripts/versiontemplates/ReactNativeVersion.java.template index 94d103f10002a9..6134b9f3969c32 100644 --- a/scripts/versiontemplates/ReactNativeVersion.java.template +++ b/scripts/versiontemplates/ReactNativeVersion.java.template @@ -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 VERSION = MapBuilder.of( "major", ${major}, diff --git a/scripts/versiontemplates/ReactNativeVersion.js.template b/scripts/versiontemplates/ReactNativeVersion.js.template index 72bfcfef110580..a2ceea7dc227e2 100644 --- a/scripts/versiontemplates/ReactNativeVersion.js.template +++ b/scripts/versiontemplates/ReactNativeVersion.js.template @@ -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}, diff --git a/template/package.json b/template/package.json index 5cf9a0f48d0196..cafc838a718f0c 100644 --- a/template/package.json +++ b/template/package.json @@ -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",