Merge branch 'main' into feat/data-system

launchdarkly · Nov 29, 2023 · 68e7ce7 · 68e7ce7
2 parents 9ce95b6 + 0c1d22d
commit 68e7ce7
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 23 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
-  "libs/client-sdk": "3.2.1",
+  "libs/client-sdk": "3.2.2",
   "libs/server-sent-events": "0.2.0",
-  "libs/common": "0.5.0",
-  "libs/internal": "0.3.0",
-  "libs/server-sdk": "0.1.0"
+  "libs/common": "1.0.0",
+  "libs/internal": "0.4.0",
+  "libs/server-sdk": "0.2.0"
 }
diff --git a/cmake/json.cmake b/cmake/json.cmake
@@ -10,7 +10,7 @@ if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24")
 endif ()
 
 FetchContent_Declare(json
-        URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz
-        )
+        URL https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz
+)
 
 FetchContent_MakeAvailable(json)
diff --git a/libs/client-sdk/CHANGELOG.md b/libs/client-sdk/CHANGELOG.md
@@ -8,6 +8,13 @@ All notable changes to the LaunchDarkly Client-Side SDK for C/C++ will be docume
   * dependencies
     * launchdarkly-cpp-internal bumped from 0.1.9 to 0.1.10
 
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * launchdarkly-cpp-internal bumped from 0.3.0 to 0.4.0
+    * launchdarkly-cpp-common bumped from 0.5.0 to 1.0.0
+
 ## [3.2.1](https://github.com/launchdarkly/cpp-sdks/compare/launchdarkly-cpp-client-v3.2.0...launchdarkly-cpp-client-v3.2.1) (2023-10-23)
 
 

diff --git a/libs/client-sdk/CMakeLists.txt b/libs/client-sdk/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.19)
 
 project(
         LaunchDarklyCPPClient
-        VERSION 3.2.1 # {x-release-please-version}
+        VERSION 3.2.2 # {x-release-please-version}
         DESCRIPTION "LaunchDarkly C++ Client SDK"
         LANGUAGES CXX C
 )

diff --git a/libs/client-sdk/include/launchdarkly/client_side/client.hpp b/libs/client-sdk/include/launchdarkly/client_side/client.hpp
@@ -324,7 +324,7 @@ class Client : public IClient {
 
    private:
     inline static char const* const kVersion =
-        "3.2.1";  // {x-release-please-version}
+        "3.2.2";  // {x-release-please-version}
     std::unique_ptr<IClient> client;
 };
 

diff --git a/libs/client-sdk/package.json b/libs/client-sdk/package.json
@@ -1,11 +1,11 @@
 {
   "name": "launchdarkly-cpp-client",
   "description": "This package.json exists for modeling dependencies for the release process.",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "private": true,
   "dependencies": {
-    "launchdarkly-cpp-internal": "0.3.0",
-    "launchdarkly-cpp-common": "0.5.0",
+    "launchdarkly-cpp-internal": "0.4.0",
+    "launchdarkly-cpp-common": "1.0.0",
     "launchdarkly-cpp-sse-client": "0.2.0"
   }
 }
diff --git a/libs/client-sdk/tests/client_c_bindings_test.cpp b/libs/client-sdk/tests/client_c_bindings_test.cpp
@@ -27,7 +27,7 @@ TEST(ClientBindings, MinimalInstantiation) {
 
     char const* version = LDClientSDK_Version();
     ASSERT_TRUE(version);
-    ASSERT_STREQ(version, "3.2.1");  // {x-release-please-version}
+    ASSERT_STREQ(version, "3.2.2");  // {x-release-please-version}
 
     LDClientSDK_Free(sdk);
 }

diff --git a/libs/client-sdk/tests/client_test.cpp b/libs/client-sdk/tests/client_test.cpp
@@ -16,7 +16,7 @@ TEST(ClientTest, ClientConstructedWithMinimalConfigAndContext) {
 
     char const* version = client.Version();
     ASSERT_TRUE(version);
-    ASSERT_STREQ(version, "3.2.1");  // {x-release-please-version}
+    ASSERT_STREQ(version, "3.2.2");  // {x-release-please-version}
 }
 
 TEST(ClientTest, AllFlagsIsEmpty) {

diff --git a/libs/common/CHANGELOG.md b/libs/common/CHANGELOG.md
@@ -12,6 +12,17 @@
   * dependencies
     * launchdarkly-cpp-sse-client bumped from 0.1.1 to 0.1.2
 
+## [1.0.0](https://github.com/launchdarkly/cpp-sdks/compare/launchdarkly-cpp-common-v0.5.0...launchdarkly-cpp-common-v1.0.0) (2023-11-29)
+
+
+### ⚠ BREAKING CHANGES
+
+* move server side config into lib/server ([#283](https://github.com/launchdarkly/cpp-sdks/issues/283))
+
+### Code Refactoring
+
+* move server side config into lib/server ([#283](https://github.com/launchdarkly/cpp-sdks/issues/283)) ([c58de8f](https://github.com/launchdarkly/cpp-sdks/commit/c58de8f3914bf83fa8662cccf5b284de3179852d))
+
 ## [0.5.0](https://github.com/launchdarkly/cpp-sdks/compare/launchdarkly-cpp-common-v0.4.0...launchdarkly-cpp-common-v0.5.0) (2023-10-23)
 
 

diff --git a/libs/common/package.json b/libs/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "launchdarkly-cpp-common",
   "description": "This package.json exists for modeling dependencies for the release process.",
-  "version": "0.5.0",
+  "version": "1.0.0",
   "private": true
 }
diff --git a/libs/internal/CHANGELOG.md b/libs/internal/CHANGELOG.md
@@ -46,6 +46,20 @@
   * dependencies
     * launchdarkly-cpp-common bumped from 0.3.5 to 0.3.6
 
+## [0.4.0](https://github.com/launchdarkly/cpp-sdks/compare/launchdarkly-cpp-internal-v0.3.0...launchdarkly-cpp-internal-v0.4.0) (2023-11-29)
+
+
+### Features
+
+* omit empty items from data model JSON serialization ([#309](https://github.com/launchdarkly/cpp-sdks/issues/309)) ([9141732](https://github.com/launchdarkly/cpp-sdks/commit/9141732e7ec1c42481e52f61da3d726740f17595))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * launchdarkly-cpp-common bumped from 0.5.0 to 1.0.0
+
 ## [0.3.0](https://github.com/launchdarkly/cpp-sdks/compare/launchdarkly-cpp-internal-v0.2.0...launchdarkly-cpp-internal-v0.3.0) (2023-10-23)
 
 

diff --git a/libs/internal/package.json b/libs/internal/package.json
@@ -1,9 +1,9 @@
 {
   "name": "launchdarkly-cpp-internal",
   "description": "This package.json exists for modeling dependencies for the release process.",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "private": true,
   "dependencies": {
-    "launchdarkly-cpp-common": "0.5.0"
+    "launchdarkly-cpp-common": "1.0.0"
   }
 }
diff --git a/libs/server-sdk/CHANGELOG.md b/libs/server-sdk/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.2.0](https://github.com/launchdarkly/cpp-sdks/compare/launchdarkly-cpp-server-v0.1.0...launchdarkly-cpp-server-v0.2.0) (2023-11-29)
+
+
+### ⚠ BREAKING CHANGES
+
+* move server side config into lib/server ([#283](https://github.com/launchdarkly/cpp-sdks/issues/283))
+
+### Code Refactoring
+
+* move server side config into lib/server ([#283](https://github.com/launchdarkly/cpp-sdks/issues/283)) ([c58de8f](https://github.com/launchdarkly/cpp-sdks/commit/c58de8f3914bf83fa8662cccf5b284de3179852d))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * launchdarkly-cpp-internal bumped from 0.3.0 to 0.4.0
+    * launchdarkly-cpp-common bumped from 0.5.0 to 1.0.0
+
 ## 0.1.0 (2023-10-25)
 
 

diff --git a/libs/server-sdk/CMakeLists.txt b/libs/server-sdk/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.19)
 
 project(
         LaunchDarklyCPPServer
-        VERSION 0.1.0 # {x-release-please-version}
+        VERSION 0.2.0 # {x-release-please-version}
         DESCRIPTION "LaunchDarkly C++ Server SDK"
         LANGUAGES CXX C
 )

diff --git a/libs/server-sdk/include/launchdarkly/server_side/client.hpp b/libs/server-sdk/include/launchdarkly/server_side/client.hpp
@@ -348,7 +348,7 @@ class Client : public IClient {
 
    private:
     inline static char const* const kVersion =
-        "0.1.0";  // {x-release-please-version}
+        "0.2.0";  // {x-release-please-version}
     std::unique_ptr<IClient> client;
 };
 

diff --git a/libs/server-sdk/package.json b/libs/server-sdk/package.json
@@ -1,11 +1,11 @@
 {
   "name": "launchdarkly-cpp-server",
   "description": "This package.json exists for modeling dependencies for the release process.",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
   "dependencies": {
-    "launchdarkly-cpp-internal": "0.3.0",
-    "launchdarkly-cpp-common": "0.5.0",
+    "launchdarkly-cpp-internal": "0.4.0",
+    "launchdarkly-cpp-common": "1.0.0",
     "launchdarkly-cpp-sse-client": "0.2.0"
   }
 }
diff --git a/libs/server-sdk/tests/client_test.cpp b/libs/server-sdk/tests/client_test.cpp
@@ -20,7 +20,7 @@ class ClientTest : public ::testing::Test {
 TEST_F(ClientTest, ClientConstructedWithMinimalConfigAndContextT) {
     char const* version = client_.Version();
     ASSERT_TRUE(version);
-    ASSERT_STREQ(version, "0.1.0");  // {x-release-please-version}
+    ASSERT_STREQ(version, "0.2.0");  // {x-release-please-version}
 }
 
 TEST_F(ClientTest, BoolVariationDefaultPassesThrough) {

diff --git a/libs/server-sdk/tests/server_c_bindings_test.cpp b/libs/server-sdk/tests/server_c_bindings_test.cpp
@@ -21,7 +21,7 @@ TEST(ClientBindings, MinimalInstantiation) {
 
     char const* version = LDServerSDK_Version();
     ASSERT_TRUE(version);
-    ASSERT_STREQ(version, "0.1.0");  // {x-release-please-version}
+    ASSERT_STREQ(version, "0.2.0");  // {x-release-please-version}
 
     LDServerSDK_Free(sdk);
 }