From a1f1b3658b46e9786ee9cb19975e833596a6f250 Mon Sep 17 00:00:00 2001
From: Christian Zentgraf <kitgocz@gmail.com>
Date: Thu, 4 Apr 2024 18:58:22 -0400
Subject: [PATCH] upgrade fbos dependencies to v2024.04.01.00

---
 CMake/resolve_dependency_modules/README.md       | 16 ++++++++--------
 .../folly/CMakeLists.txt                         |  4 ++--
 scripts/setup-centos8.sh                         |  2 +-
 scripts/setup-macos.sh                           |  2 +-
 scripts/setup-ubuntu.sh                          |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CMake/resolve_dependency_modules/README.md b/CMake/resolve_dependency_modules/README.md
index ecde6b8dd20c..b3c13da17437 100644
--- a/CMake/resolve_dependency_modules/README.md
+++ b/CMake/resolve_dependency_modules/README.md
@@ -2,11 +2,11 @@
 Following is the list of libraries and their minimum version
 that Velox requires. Some of these libraries can be installed
 via a platform's package manager (eg. `brew` on MacOS).
-The versions of certain libraries is the default provided by 
+The versions of certain libraries is the default provided by
 the platform's package manager. Some libraries can be bundled
 by Velox. See details on bundling below.
 
-| Library Name      | Minimum Version | Bundled? | 
+| Library Name      | Minimum Version | Bundled? |
 |-------------------|-----------------|----------|
 | ninja             | default         | No       |
 | ccache            | default         | No       |
@@ -16,7 +16,7 @@ by Velox. See details on bundling below.
 | gtest (testing)   | default         | Yes      |
 | libevent          | default         | No       |
 | libsodium         | default         | No       |
-| lz4               | default         | No       | 
+| lz4               | default         | No       |
 | snappy            | default         | No       |
 | lzo               | default         | No       |
 | xz                | default         | No       |
@@ -32,11 +32,11 @@ by Velox. See details on bundling below.
 | re2               | 2021-04-01      | Yes      |
 | fmt               | 10.1.1          | Yes      |
 | simdjson          | 3.2.0           | Yes      |
-| folly             | v2024.02.26.00  | Yes      |
-| fizz              | v2024.02.26.00  | No       |
-| wangle            | v2024.02.26.00  | No       |
-| mvfst             | v2024.02.26.00  | No       |
-| fbthrift          | v2024.02.26.00  | No       |
+| folly             | v2024.04.01.00  | Yes      |
+| fizz              | v2024.04.01.00  | No       |
+| wangle            | v2024.04.01.00  | No       |
+| mvfst             | v2024.04.01.00  | No       |
+| fbthrift          | v2024.04.01.00  | No       |
 | DuckDB (testing)  | 0.8.1           | Yes      |
 | cpr (testing)     | 1.10.15         | Yes      |
 
diff --git a/CMake/resolve_dependency_modules/folly/CMakeLists.txt b/CMake/resolve_dependency_modules/folly/CMakeLists.txt
index a855a3b29439..92c62e298cfe 100644
--- a/CMake/resolve_dependency_modules/folly/CMakeLists.txt
+++ b/CMake/resolve_dependency_modules/folly/CMakeLists.txt
@@ -14,9 +14,9 @@
 project(Folly)
 cmake_minimum_required(VERSION 3.14)
 
-set(VELOX_FOLLY_BUILD_VERSION v2024.02.26.00)
+set(VELOX_FOLLY_BUILD_VERSION v2024.04.01.00)
 set(VELOX_FOLLY_BUILD_SHA256_CHECKSUM
-    0a5570be503e377f2a9c178b926cd350ae72bddaeb0c7164a1fac7118c00e866)
+    e0c8386eea1a317ff17f1edc36c29362db94aeca8689659f1c530ea777779409)
 set(VELOX_FOLLY_SOURCE_URL
     "https://github.com/facebook/folly/releases/download/${VELOX_FOLLY_BUILD_VERSION}/folly-${VELOX_FOLLY_BUILD_VERSION}.tar.gz"
 )
diff --git a/scripts/setup-centos8.sh b/scripts/setup-centos8.sh
index cf668b61d536..0731dafc76c1 100755
--- a/scripts/setup-centos8.sh
+++ b/scripts/setup-centos8.sh
@@ -132,7 +132,7 @@ function install_protobuf {
   )
 }
 
-FB_OS_VERSION="v2024.02.26.00"
+FB_OS_VERSION="v2024.04.01.00"
 
 function install_fizz {
   wget_and_untar https://github.com/facebookincubator/fizz/archive/refs/tags/${FB_OS_VERSION}.tar.gz fizz
diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh
index aa47e298b6a4..f597d2d54003 100755
--- a/scripts/setup-macos.sh
+++ b/scripts/setup-macos.sh
@@ -36,7 +36,7 @@ NPROC=$(getconf _NPROCESSORS_ONLN)
 DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
 MACOS_VELOX_DEPS="flex bison protobuf@21 icu4c boost gflags glog libevent lz4 lzo snappy xz zstd openssl libsodium"
 MACOS_BUILD_DEPS="ninja cmake ccache"
-FB_OS_VERSION="v2024.02.26.00"
+FB_OS_VERSION="v2024.04.01.00"
 
 function update_brew {
   DEFAULT_BREW_PATH=/usr/local/bin/brew
diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
index 3e9951631623..d85c9320ed6f 100755
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@@ -35,7 +35,7 @@ source $SCRIPTDIR/setup-helper-functions.sh
 CPU_TARGET="${CPU_TARGET:-avx}"
 COMPILER_FLAGS=$(get_cxx_flags "$CPU_TARGET")
 export COMPILER_FLAGS
-FB_OS_VERSION=v2024.02.26.00
+FB_OS_VERSION=v2024.04.01.00
 FMT_VERSION=10.1.1
 BOOST_VERSION=boost-1.84.0
 NPROC=$(getconf _NPROCESSORS_ONLN)
@@ -135,7 +135,7 @@ function install_conda {
     echo "Unsupported architecture: $ARCH"
     exit 1
   fi
-  
+
   mkdir -p conda && cd conda
   wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-$ARCH.sh
   bash Miniconda3-latest-Linux-$ARCH.sh -b -p $MINICONDA_PATH