Fix dependency conflict for RCT-Folly (#118)

Fix dependency conflict for `RCT-Folly` library when New Architecture is enabled (remove the fixed library version)
hypertrack · Nov 18, 2024 · 8808a37 · 8808a37
1 parent aeeec9e
commit 8808a37
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.6.4] - 2024-11-17
+
+### Fixed
+
+- Dependency conflict for `RCT-Folly` library when New Architecture is enabled (removed the fixed folly version)
+
 ## [13.6.3] - 2024-11-13
 
 ### Changed
@@ -962,3 +968,4 @@ Initial release.
 [13.6.1]: https://github.com/hypertrack/sdk-react-native/releases/tag/13.6.1
 [13.6.2]: https://github.com/hypertrack/sdk-react-native/releases/tag/13.6.2
 [13.6.3]: https://github.com/hypertrack/sdk-react-native/releases/tag/13.6.3
+[13.6.4]: https://github.com/hypertrack/sdk-react-native/releases/tag/13.6.4
diff --git a/docs/classes/HyperTrack.html b/docs/classes/HyperTrack.html
diff --git a/docs/enums/HyperTrackError.html b/docs/enums/HyperTrackError.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/modules.html b/docs/modules.html
diff --git a/docs/types/Errors.html b/docs/types/Errors.html
diff --git a/docs/types/Failure.html b/docs/types/Failure.html
diff --git a/docs/types/Location.html b/docs/types/Location.html
diff --git a/docs/types/LocationError.html b/docs/types/LocationError.html
diff --git a/docs/types/LocationWithDeviation.html b/docs/types/LocationWithDeviation.html
diff --git a/docs/types/NotRunning.html b/docs/types/NotRunning.html
diff --git a/docs/types/Order.html b/docs/types/Order.html
diff --git a/docs/types/OrderStatus.html b/docs/types/OrderStatus.html
diff --git a/docs/types/Result.html b/docs/types/Result.html
diff --git a/docs/types/Starting.html b/docs/types/Starting.html
diff --git a/docs/types/Success.html b/docs/types/Success.html
diff --git a/plugin_android_activity_service_google/package.json b/plugin_android_activity_service_google/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hypertrack-sdk-react-native-plugin-android-activity-service-google",
-  "version": "13.6.3",
+  "version": "13.6.4",
   "description": "A wrapper around `Activity Service Google` plugin for HyperTrack SDK Android that is used with `hypertrack-sdk-react-native`",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/plugin_android_location_services_google/package.json b/plugin_android_location_services_google/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hypertrack-sdk-react-native-plugin-android-location-services-google",
-  "version": "13.6.3",
+  "version": "13.6.4",
   "description": "A wrapper around `Location Services Google` plugin for HyperTrack SDK Android that is used with `hypertrack-sdk-react-native`",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/plugin_android_location_services_google_19_0_1/package.json b/plugin_android_location_services_google_19_0_1/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hypertrack-sdk-react-native-plugin-android-location-services-google-19-0-1",
-  "version": "13.6.3",
+  "version": "13.6.4",
   "description": "A wrapper around `Location Services Google 19.0.1` plugin for HyperTrack SDK Android that is used with `hypertrack-sdk-react-native`",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/plugin_android_push_service_firebase/package.json b/plugin_android_push_service_firebase/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hypertrack-sdk-react-native-plugin-android-push-service-firebase",
-  "version": "13.6.3",
+  "version": "13.6.4",
   "description": "A wrapper around `Push Service Firebase` plugin for HyperTrack SDK Android that is used with `hypertrack-sdk-react-native`",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/sdk/hypertrack-sdk-react-native.podspec b/sdk/hypertrack-sdk-react-native.podspec
@@ -1,7 +1,6 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_version = '2021.06.28.00-v2'
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
@@ -29,7 +28,7 @@ Pod::Spec.new do |s|
     }
 
     s.dependency "React-Codegen"
-    s.dependency "RCT-Folly", folly_version
+    s.dependency "RCT-Folly"
     s.dependency "RCTRequired"
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"

diff --git a/sdk/package.json b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hypertrack-sdk-react-native",
-  "version": "13.6.3",
+  "version": "13.6.4",
   "description": "React Native HyperTrack SDK is a wrapper around native iOS and Android SDKs that allows to integrate HyperTrack into React Native apps.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",