Merge pull request #270 from getbraincloud/release/5.0

Release/5.0
getbraincloud · Sep 14, 2023 · 8ce3b8c · 8ce3b8c
2 parents 8d75eaf + bd8d745
commit 8ce3b8c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/BrainCloudCpp.podspec b/BrainCloudCpp.podspec
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
 
   s.name     = "BrainCloudCpp"
 
-  s.version  = "5.0.0"
+  s.version  = "5.0.1"
 
   s.summary  = "The C++ client library for brainCloud"
   s.homepage = "http://getbraincloud.com/"
@@ -41,17 +41,20 @@ Pod::Spec.new do |s|
   s.source_files            = "src/*.{c,cpp}", "src/apple/*.{c,cpp,mm}", "include/braincloud/*.h", "include/braincloud/internal/*.h", "include/braincloud/internal/apple/*.h"
   s.exclude_files           = "src/DefaultSaveDataHelper.cpp", "src/DefaultGUID.cpp" , "src/DefaultFileUploader.cpp", "src/DefaultWebSocket.cpp", "src/DefaultPinger.cpp"
 
-  # hack for use_frameworks!
+  # for use_frameworks!
+  # to use development pod: change below to your full source code path
+  # to use cocoapod release: change to be relative to ${PODS_ROOT}
   s.xcconfig = {
-        'USER_HEADER_SEARCH_PATHS' => '"${SRCROOT}/include/"'
+        # eg. 'USER_HEADER_SEARCH_PATHS' => '"/local/path/to/braincloud-cpp/include"'
+        'USER_HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/BrainCloudCpp/include"'
   }
 
   # ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
 
   s.libraries               = 'c++', 'z'
   s.osx.framework           = 'LDAP'
   s.dependency                'SSKeychain'
- s.dependency                'BrainCloudJsonCpp', '~>1.1.4'
+  s.dependency                'BrainCloudJsonCpp', '~>1.2'
   s.ios.dependency            'SocketRocket', '~> 0.5'
   s.osx.dependency            'SocketRocket', '~> 0.5'
   #s.watchos.dependency       'SocketRocket', '~> 0.5'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -576,6 +576,8 @@ if (USE_LIBWEBSOCKETS)
           target_compile_options(mbedtls PRIVATE -Wno-unused-but-set-variable)
           target_compile_options(mbedcrypto PRIVATE -Wno-unused-but-set-variable)
        endif()
+    elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        target_compile_options(websockets PRIVATE -Wno-typedef-redefinition)
     endif()
 
     list(APPEND libs websockets)

diff --git a/lib/jsoncpp-1.0.0 b/lib/jsoncpp-1.0.0
diff --git a/src/BrainCloudClient.cpp b/src/BrainCloudClient.cpp
@@ -27,7 +27,7 @@ namespace BrainCloud
             "Singleton usage is disabled. If called by mistake, use your own variable that holds an instance of the bcWrapper/bcClient.";
 
     BrainCloudClient * BrainCloudClient::_instance = NULL;
-    std::string BrainCloudClient::s_brainCloudClientVersion = "5.0.0";
+    std::string BrainCloudClient::s_brainCloudClientVersion = "5.0.1";
     const char* BC_SERVER_URL = "https://api.braincloudservers.com/dispatcherv2"; 
 
     /**
+2 −2		BrainCloudJsonCpp.podspec
+4 −4		json/json.h
+8 −0		jsoncpp.cpp