2.5.3

noear · Jun 2, 2024 · 94aff55 · 94aff55
1 parent ba20e26
commit 94aff55
Show file tree

Hide file tree

Showing 25 changed files with 33 additions and 31 deletions.
diff --git a/android/android_test/app/build.gradle.kts b/android/android_test/app/build.gradle.kts
@@ -67,10 +67,10 @@ dependencies {
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 
-//    implementation("org.noear:socketd-transport-smartsocket:2.5.2")
-    implementation("org.noear:socketd-transport-java-tcp:2.5.2")
-    implementation("org.noear:socketd-transport-java-udp:2.5.2")
-    implementation("org.noear:socketd-transport-java-websocket:2.5.2")
+//    implementation("org.noear:socketd-transport-smartsocket:2.5.3")
+    implementation("org.noear:socketd-transport-java-tcp:2.5.3")
+    implementation("org.noear:socketd-transport-java-udp:2.5.3")
+    implementation("org.noear:socketd-transport-java-websocket:2.5.3")
 
     implementation("com.github.tony19:logback-android:3.0.0")
 }
diff --git a/java/socketd-examples/pom.xml b/java/socketd-examples/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-parent/pom.xml b/java/socketd-parent/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.noear</groupId>
     <artifactId>socketd-parent</artifactId>
-    <version>2.5.2</version>
+    <version>2.5.3</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
 
-        <socketd.version>2.5.2</socketd.version>
+        <socketd.version>2.5.3</socketd.version>
 
         <slf4j.version>2.0.12</slf4j.version>
         <junit5.version>5.9.1</junit5.version>

diff --git a/java/socketd-transport-test/pom.xml b/java/socketd-transport-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-aeron/pom.xml b/java/socketd-transport/socketd-transport-aeron/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-java-kcp/pom.xml b/java/socketd-transport/socketd-transport-java-kcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-java-tcp/pom.xml b/java/socketd-transport/socketd-transport-java-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-java-udp/pom.xml b/java/socketd-transport/socketd-transport-java-udp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-java-websocket/pom.xml b/java/socketd-transport/socketd-transport-java-websocket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-neta/pom.xml b/java/socketd-transport/socketd-transport-neta/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-netty/pom.xml b/java/socketd-transport/socketd-transport-netty/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-smartsocket/pom.xml b/java/socketd-transport/socketd-transport-smartsocket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-spring-websocket/pom.xml b/java/socketd-transport/socketd-transport-spring-websocket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd/pom.xml b/java/socketd/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
         <relativePath>../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd/src/main/java/org/noear/socketd/SocketD.java b/java/socketd/src/main/java/org/noear/socketd/SocketD.java
@@ -24,7 +24,7 @@ public class SocketD {
      * 框架版本号
      */
     public static String version() {
-        return "2.5.2";
+        return "2.5.3";
     }
 
     /**

diff --git a/javascript/ LOG.md b/javascript/ LOG.md
@@ -1,8 +1,10 @@
+### 2.5.3
+* 修复 在 ios/android 上检测 TextEncoder 出错的问题（2.3.10 出现的）
+
 ### 2.5.2
 * 添加 SessionUtils 工具类
 * 添加 Session::isActive()
 * 添加 BroadcastBroker 接口（提供类似 stomp 的体验）
-* 修复 在 ios/android 模拟器上检测 TextEncoder 出错的问题
 
 ### 2.5.0
 * 添加 websocket 适配子协议验证（避免乱连）

diff --git a/javascript/release/socket.d.js b/javascript/release/socket.d.js
diff --git a/javascript/socketd-examples/demo01-js-ws/js/socket.d.js b/javascript/socketd-examples/demo01-js-ws/js/socket.d.js
diff --git a/javascript/socketd-examples/demo02-node-ws/package.json b/javascript/socketd-examples/demo02-node-ws/package.json
@@ -3,7 +3,7 @@
   "description": "SocketD Node Test Project",
   "author": "aoshiguchen",
   "dependencies": {
-    "@noear/socket.d": "2.5.2",
+    "@noear/socket.d": "2.5.3",
     "ws": "^8.16.0"
   }
 }
diff --git a/javascript/socketd-examples/demo03-uniapp-ws/package.json b/javascript/socketd-examples/demo03-uniapp-ws/package.json
@@ -3,6 +3,6 @@
   "description": "SocketD Uniapp Test Project",
   "author": "ZhangQi",
   "dependencies": {
-    "@noear/socket.d": "2.5.2"
+    "@noear/socket.d": "2.5.3"
   }
 }
diff --git a/javascript/socketd-examples/demo06-im/index.html b/javascript/socketd-examples/demo06-im/index.html
@@ -4,7 +4,7 @@
     <title>Socket.D-im demo</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8 " />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes" />
-    <script src="https://cdn.jsdelivr.net/gh/noear/[email protected].2/javascript/release/socket.d.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/noear/[email protected].3/javascript/release/socket.d.js"></script>
     <style>
         body{max-width: 900px; margin: auto;}
         table th {  text-align: right; }

diff --git a/javascript/socketd/src/socketd/SocketD.ts b/javascript/socketd/src/socketd/SocketD.ts
@@ -48,7 +48,7 @@ export class SocketD {
      * 框架版本号
      */
     static version(): string {
-        return "2.5.2";
+        return "2.5.3";
     }
 
     /**

diff --git a/javascript/socketd/webpack.md b/javascript/socketd/webpack.md
@@ -39,7 +39,7 @@ npm publish
 ```javascript
 
 /*!
- * Socket.D v2.5.2
+ * Socket.D v2.5.3
  * (c) 2023-2024 noear.org
  * Released under the Apache-2.0 License.
  */

diff --git a/python/socketd/setup.py b/python/socketd/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='socket.d',
-    version='2.5.2',
+    version='2.5.3',
     description='@noear/socket.d python project',
     author='noear,bai',
     url='https://socketd.noear.org/',

diff --git a/python/socketd/socketd/SocketD.py b/python/socketd/socketd/SocketD.py
@@ -14,7 +14,7 @@
 
 
 def version() -> str:
-    return "2.5.2"
+    return "2.5.3"
 
 def protocol_name() -> str:
     return "Socket.D"