From 27aa60a1c06df52084030b95bd52748d64e52a0e Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@meta.com>
Date: Fri, 11 Aug 2023 09:31:40 -0700
Subject: [PATCH] Consoliate Native deps version inside the Version Catalog
 (#38945)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/38945

Another pass of moving version numbers into a single place.
This time I've moved all the native dependencies from gradle.properties to the version catalog

Changelog:
[Internal] [Changed] - Consoliate Native deps version inside the Version Catalog

Reviewed By: cipolleschi

Differential Revision: D48263910

fbshipit-source-id: 0743908282dc658e2da347052e3b721704859f12
---
 packages/react-native/ReactAndroid/build.gradle      | 9 +++++++++
 packages/react-native/ReactAndroid/gradle.properties | 9 ---------
 packages/react-native/gradle/libs.versions.toml      | 8 ++++++++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/react-native/ReactAndroid/build.gradle b/packages/react-native/ReactAndroid/build.gradle
index a1b6f300c5c..8fcbe93f293 100644
--- a/packages/react-native/ReactAndroid/build.gradle
+++ b/packages/react-native/ReactAndroid/build.gradle
@@ -61,6 +61,15 @@ def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH")
 def skipPrefabPublishing = System.getenv("REACT_NATIVE_SKIP_PREFAB") != null
 def prefabHeadersDir = project.file("$buildDir/prefab-headers")
 
+// Native versions which are defined inside the version catalog (libs.versions.toml)
+def BOOST_VERSION = libs.versions.boost.get()
+def DOUBLE_CONVERSION_VERSION = libs.versions.doubleconversion.get()
+def FMT_VERSION = libs.versions.fmt.get()
+def FOLLY_VERSION = libs.versions.folly.get()
+def GLOG_VERSION = libs.versions.glog.get()
+def LIBEVENT_VERSION = libs.versions.libevent.get()
+def GTEST_VERSION = libs.versions.gtest.get()
+
 final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTask) {
     dependsOn(prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog)
     dependsOn("generateCodegenArtifactsFromSchema")
diff --git a/packages/react-native/ReactAndroid/gradle.properties b/packages/react-native/ReactAndroid/gradle.properties
index a32d36a5556..354f9c4dd86 100644
--- a/packages/react-native/ReactAndroid/gradle.properties
+++ b/packages/react-native/ReactAndroid/gradle.properties
@@ -1,15 +1,6 @@
 VERSION_NAME=1000.0.0
 GROUP=com.facebook.react
 
-# Native Dependency Versions
-BOOST_VERSION=1_76_0
-DOUBLE_CONVERSION_VERSION=1.1.6
-FMT_VERSION=6.2.1
-FOLLY_VERSION=2021.07.22.00
-GLOG_VERSION=0.3.5
-LIBEVENT_VERSION=2.1.12
-GTEST_VERSION=1.12.1
-
 android.useAndroidX=true
 android.enableJetifier=true
 
diff --git a/packages/react-native/gradle/libs.versions.toml b/packages/react-native/gradle/libs.versions.toml
index 01467c40b29..870d38004c3 100644
--- a/packages/react-native/gradle/libs.versions.toml
+++ b/packages/react-native/gradle/libs.versions.toml
@@ -31,6 +31,14 @@ robolectric = "4.9.2"
 soloader = "0.10.5"
 xstream = "1.4.20"
 yoga-proguard-annotations = "1.19.0"
+# Native Dependencies
+boost="1_76_0"
+doubleconversion="1.1.6"
+fmt="6.2.1"
+folly="2021.07.22.00"
+glog="0.3.5"
+libevent="2.1.12"
+gtest="1.12.1"
 
 [libraries]
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }