Prepare release v2.1.4 (#2037)

Author: halx99

1k/1kiss.ps1

@@ -205,7 +205,7 @@ $manifest = @{
     cmake        = '3.23.0+';
     ninja        = '1.10.0+';
     python       = '3.8.0+';
-    jdk          = '11.0.23+';
+    jdk          = '17.0.10+'; # jdk17+ works for android cmdlinetools 7.0+
     emsdk        = '3.1.53+';
     cmdlinetools = '7.0+'; # android cmdlinetools
 }
@@ -225,7 +225,7 @@ $cmake_generators = @{
 $channels = @{}
 
 # refer to: https://developer.android.com/studio#command-line-tools-only
-$cmdlinetools_rev = '11076708'
+$cmdlinetools_rev = '11076708' # 12.0
 
 $android_sdk_tools = @{
     'build-tools' = '34.0.0'

1k/manifest.ps1

@@ -9,13 +9,13 @@
 
 # add or overwrite tool version like follow
 if ($Global:is_axmol_app -or $Global:is_axmol_engine) {
-    $manifest['nuget'] = '5.5.1' # since 5.6.0, require .net 4.0
+    $manifest['nuget'] = '5.5.1' # since 5.6.0, requires .net 4.0
     $manifest['glslcc'] = '1.9.5+'
     $manifest['cmake'] = '3.29.3+'
     $manifest['emsdk'] = '3.1.63+'
     $manifest['jdk'] = '17.0.10+'
 }
 
 # android sdk tools
-$android_sdk_tools['build-tools'] = '34.0.0' # match with AGP, current 8.2.1 android studio 2023.1.1
+$android_sdk_tools['build-tools'] = '34.0.0' # match with AGP-8.2.1+, android studio 2023.1.1+
 $android_sdk_tools['platforms'] = 'android-34'

3rdparty/README.md

@@ -22,7 +22,7 @@
 
 ## c-ares
 - [![Upstream](https://img.shields.io/github/v/release/c-ares/c-ares?label=Upstream)](https://github.com/c-ares/c-ares)
-- Version: 1.29.0
+- Version: 1.32.2
 - License: MIT
 
 ## Chipmunk2D
@@ -174,7 +174,7 @@
 
 ## OpenSSL
 - [![Upstream](https://img.shields.io/github/v/tag/openssl/openssl?label=Upstream)](https://github.com/openssl/openssl)
-- Version: 3.0.13
+- Version: 3.3.1
 - License: Apache-2.0
 
 ## png

CHANGELOG.md

@@ -58,6 +58,7 @@
 - Use new logging system for audio by @halx99
 - Update DrawNodeV2 0.94 by @aismann in https://github.com/axmolengine/axmol/pull/2008
 - Ensure the RenderTexture reference is valid on threaded saveToFile task completion by @rh101 in https://github.com/axmolengine/axmol/pull/2024
+- Some warning and other minor fixes by @smilediver in https://github.com/axmolengine/axmol/pull/2038
 
 
 ### sdks & tools updates
@@ -68,12 +69,15 @@
 
 ### 3rdparty Updates
 
+- openssl: 3.0.13 ==> 3.3.1
 - Clipper2: 1.3.0 ==> 1.4.0
 - simdjson: 3.9.2 ==> 3.9.5
 - fmtlib: 10.2.1 ==> 11.0.1
 - yasio: 4.2.2 ==> 4.2.3
 - oboe: 1.8.1 ==> 1.9.0
 - plainlua: 5.4.6 ==> 5.4.7
+- c-ares: 1.29.0 ==> 1.32.2
+- luajit: 2.1-d06beb0 ==> 2.1-04dca79
 
 ## axmol-2.1.3 May.26 2024
 

manifest.json

@@ -1,11 +1,10 @@
 {
   "versions": {
-    "1kdist": "v86",
+    "1kdist": "v88",
     "oboe": "1.9.0",
     "kcp": "v1.7-f2aa30e",
     "lz4": "v1.9.4",
     "yaml-cpp": "0.8.0",
-    "box2d-optimized": "7ef46c1",
     "sample-assets": "master"
   },
   "mirrors": {

tests/cpp-tests/Source/NetworkTest/WebSocketTest/WebSocketTest.cpp

@@ -271,7 +271,7 @@ void WebSocketTest::onError(network::WebSocket* ws, const network::WebSocket::Er
 {
     AXLOGD("Error was fired, error code: {}", static_cast<int>(error));
     char buf[100] = {0};
-    sprintf(buf, "An error was fired, code: {}", static_cast<int>(error));
+    sprintf(buf, "An error was fired, code: %s", static_cast<int>(error));
 
     if (ws == _wsiSendText)
     {
@@ -521,7 +521,7 @@ void WebSocketDelayTest::doReceiveText()
 void WebSocketDelayTest::onOpen(network::WebSocket* ws)
 {
     char status[256] = {0};
-    sprintf(status, "Opened, url: {}, protocol: {}", ws->getUrl(), ws->getProtocol());
+    sprintf(status, "Opened, url: %s, protocol: %s", ws->getUrl(), ws->getProtocol());
 
     AXLOGD("Websocket ({}) was opened, url: {}, protocol: {}", fmt::ptr(ws), ws->getUrl(), ws->getProtocol());
     if (ws == _wsiSendText)