From f53f5dfd9418f05cb66bfbe45fd0d2a5db7cf84e Mon Sep 17 00:00:00 2001
From: tursom <tursom@foxmail.com>
Date: Mon, 19 Apr 2021 16:19:35 +0800
Subject: [PATCH] update

---
 build.gradle.kts                                     | 12 +++++++++++-
 ts-core/build.gradle.kts                             |  2 +-
 ts-core/ts-async-http/build.gradle.kts               |  6 +++++-
 ts-core/ts-buffer/build.gradle.kts                   |  6 +++++-
 ts-core/ts-clone/build.gradle.kts                    |  2 +-
 ts-core/ts-coroutine/build.gradle.kts                |  2 +-
 .../ts-coroutine/ts-coroutine-lock/build.gradle.kts  |  2 +-
 ts-core/ts-datastruct/build.gradle.kts               |  2 +-
 ts-core/ts-delegation/build.gradle.kts               |  2 +-
 ts-core/ts-delegation/ts-observer/build.gradle.kts   |  2 +-
 ts-core/ts-encrypt/build.gradle.kts                  |  2 +-
 ts-core/ts-hash/build.gradle.kts                     |  2 +-
 ts-core/ts-json/build.gradle.kts                     |  2 +-
 ts-core/ts-log/build.gradle.kts                      |  2 +-
 ts-core/ts-mail/build.gradle.kts                     |  2 +-
 ts-core/ts-pool/build.gradle.kts                     |  2 +-
 ts-core/ts-ws-client/build.gradle.kts                |  6 +++++-
 .../core/ws/WebSocketClientHandshakerAdapter.kt      |  4 ++--
 ts-core/ts-xml/build.gradle.kts                      |  2 +-
 ts-core/ts-yaml/build.gradle.kts                     |  2 +-
 ts-database/build.gradle.kts                         |  2 +-
 ts-database/ts-mongodb/build.gradle.kts              |  2 +-
 .../ts-mongodb/ts-mongodb-spring/build.gradle.kts    |  2 +-
 ts-database/ts-redis/build.gradle.kts                |  2 +-
 ts-socket/build.gradle.kts                           |  2 +-
 ts-web/build.gradle.kts                              |  2 +-
 ts-web/ts-web-coroutine/build.gradle.kts             |  2 +-
 ts-web/ts-web-netty/build.gradle.kts                 |  2 +-
 28 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9ac12af..4837405 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -44,6 +44,12 @@ allprojects {
             }
         }
     }
+
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions.jvmTarget = "1.8"
+        kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+        //kotlinOptions.useIR = true
+    }
 }
 
 @kotlin.Suppress("UNCHECKED_CAST")
@@ -55,6 +61,10 @@ dependencies {
     testImplementation(group = "junit", name = "junit", version = "4.12")
 }
 
+artifacts {
+    archives(tasks["kotlinSourcesJar"])
+}
+
 tasks.register("install") {
     finalizedBy(tasks["publishToMavenLocal"])
 }
@@ -68,7 +78,7 @@ publishing {
 
             from(components["java"])
             try {
-                artifact(tasks["sourcesJar"])
+                artifact(tasks["kotlinSourcesJar"])
             } catch (e: Exception) {
             }
         }
diff --git a/ts-core/build.gradle.kts b/ts-core/build.gradle.kts
index 4a36a85..5a7bd4c 100644
--- a/ts-core/build.gradle.kts
+++ b/ts-core/build.gradle.kts
@@ -25,7 +25,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-async-http/build.gradle.kts b/ts-core/ts-async-http/build.gradle.kts
index b1636d3..c5a21c6 100644
--- a/ts-core/ts-async-http/build.gradle.kts
+++ b/ts-core/ts-async-http/build.gradle.kts
@@ -27,6 +27,10 @@ tasks.register("install") {
   finalizedBy(tasks["publishToMavenLocal"])
 }
 
+artifacts {
+  archives(tasks["kotlinSourcesJar"])
+}
+
 publishing {
   publications {
     create<MavenPublication>("maven") {
@@ -36,7 +40,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-buffer/build.gradle.kts b/ts-core/ts-buffer/build.gradle.kts
index 7032e3f..7383fb7 100644
--- a/ts-core/ts-buffer/build.gradle.kts
+++ b/ts-core/ts-buffer/build.gradle.kts
@@ -15,6 +15,10 @@ tasks.register("install") {
   finalizedBy(tasks["publishToMavenLocal"])
 }
 
+artifacts {
+  archives(tasks["kotlinSourcesJar"])
+}
+
 publishing {
   publications {
     create<MavenPublication>("maven") {
@@ -24,7 +28,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-clone/build.gradle.kts b/ts-core/ts-clone/build.gradle.kts
index 24cfaa9..0316bd0 100644
--- a/ts-core/ts-clone/build.gradle.kts
+++ b/ts-core/ts-clone/build.gradle.kts
@@ -26,7 +26,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-coroutine/build.gradle.kts b/ts-core/ts-coroutine/build.gradle.kts
index 1b0fb84..6d3449a 100644
--- a/ts-core/ts-coroutine/build.gradle.kts
+++ b/ts-core/ts-coroutine/build.gradle.kts
@@ -24,7 +24,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-coroutine/ts-coroutine-lock/build.gradle.kts b/ts-core/ts-coroutine/ts-coroutine-lock/build.gradle.kts
index 1b0fb84..6d3449a 100644
--- a/ts-core/ts-coroutine/ts-coroutine-lock/build.gradle.kts
+++ b/ts-core/ts-coroutine/ts-coroutine-lock/build.gradle.kts
@@ -24,7 +24,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-datastruct/build.gradle.kts b/ts-core/ts-datastruct/build.gradle.kts
index c4892e9..abfea12 100644
--- a/ts-core/ts-datastruct/build.gradle.kts
+++ b/ts-core/ts-datastruct/build.gradle.kts
@@ -26,7 +26,7 @@ publishing {
 
             from(components["java"])
             try {
-                artifact(tasks["sourcesJar"])
+                artifact(tasks["kotlinSourcesJar"])
             } catch (e: Exception) {
             }
         }
diff --git a/ts-core/ts-delegation/build.gradle.kts b/ts-core/ts-delegation/build.gradle.kts
index 5da66a7..47ef1dc 100644
--- a/ts-core/ts-delegation/build.gradle.kts
+++ b/ts-core/ts-delegation/build.gradle.kts
@@ -23,7 +23,7 @@ publishing {
 
             from(components["java"])
             try {
-                artifact(tasks["sourcesJar"])
+                artifact(tasks["kotlinSourcesJar"])
             } catch (e: Exception) {
             }
         }
diff --git a/ts-core/ts-delegation/ts-observer/build.gradle.kts b/ts-core/ts-delegation/ts-observer/build.gradle.kts
index ca4f534..b3a0202 100644
--- a/ts-core/ts-delegation/ts-observer/build.gradle.kts
+++ b/ts-core/ts-delegation/ts-observer/build.gradle.kts
@@ -24,7 +24,7 @@ publishing {
 
             from(components["java"])
             try {
-                artifact(tasks["sourcesJar"])
+                artifact(tasks["kotlinSourcesJar"])
             } catch (e: Exception) {
             }
         }
diff --git a/ts-core/ts-encrypt/build.gradle.kts b/ts-core/ts-encrypt/build.gradle.kts
index 1f9de67..7f6ef95 100644
--- a/ts-core/ts-encrypt/build.gradle.kts
+++ b/ts-core/ts-encrypt/build.gradle.kts
@@ -26,7 +26,7 @@ publishing {
 
             from(components["java"])
             try {
-                artifact(tasks["sourcesJar"])
+                artifact(tasks["kotlinSourcesJar"])
             } catch (e: Exception) {
             }
         }
diff --git a/ts-core/ts-hash/build.gradle.kts b/ts-core/ts-hash/build.gradle.kts
index e45ce1c..9d991f1 100644
--- a/ts-core/ts-hash/build.gradle.kts
+++ b/ts-core/ts-hash/build.gradle.kts
@@ -24,7 +24,7 @@ publishing {
 
             from(components["java"])
             try {
-                artifact(tasks["sourcesJar"])
+                artifact(tasks["kotlinSourcesJar"])
             } catch (e: Exception) {
             }
         }
diff --git a/ts-core/ts-json/build.gradle.kts b/ts-core/ts-json/build.gradle.kts
index 685c49b..9877fba 100644
--- a/ts-core/ts-json/build.gradle.kts
+++ b/ts-core/ts-json/build.gradle.kts
@@ -26,7 +26,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-log/build.gradle.kts b/ts-core/ts-log/build.gradle.kts
index 379c050..e73a343 100644
--- a/ts-core/ts-log/build.gradle.kts
+++ b/ts-core/ts-log/build.gradle.kts
@@ -26,7 +26,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-mail/build.gradle.kts b/ts-core/ts-mail/build.gradle.kts
index 1d536b7..b902885 100644
--- a/ts-core/ts-mail/build.gradle.kts
+++ b/ts-core/ts-mail/build.gradle.kts
@@ -24,7 +24,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-pool/build.gradle.kts b/ts-core/ts-pool/build.gradle.kts
index 4fc041d..9d5081f 100644
--- a/ts-core/ts-pool/build.gradle.kts
+++ b/ts-core/ts-pool/build.gradle.kts
@@ -25,7 +25,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-ws-client/build.gradle.kts b/ts-core/ts-ws-client/build.gradle.kts
index 139705c..ed155e0 100644
--- a/ts-core/ts-ws-client/build.gradle.kts
+++ b/ts-core/ts-ws-client/build.gradle.kts
@@ -17,6 +17,10 @@ tasks.register("install") {
   finalizedBy(tasks["publishToMavenLocal"])
 }
 
+artifacts {
+  archives(tasks["kotlinSourcesJar"])
+}
+
 publishing {
   publications {
     create<MavenPublication>("maven") {
@@ -26,7 +30,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-ws-client/src/main/kotlin/cn/tursom/core/ws/WebSocketClientHandshakerAdapter.kt b/ts-core/ts-ws-client/src/main/kotlin/cn/tursom/core/ws/WebSocketClientHandshakerAdapter.kt
index c7d28f9..b41eafb 100644
--- a/ts-core/ts-ws-client/src/main/kotlin/cn/tursom/core/ws/WebSocketClientHandshakerAdapter.kt
+++ b/ts-core/ts-ws-client/src/main/kotlin/cn/tursom/core/ws/WebSocketClientHandshakerAdapter.kt
@@ -27,8 +27,8 @@ class WebSocketClientHandshakerAdapter(
     if (!handshaker.isHandshakeComplete) {
       handshaker.finishHandshake(ctx.channel(), msg)
       handshakeFuture!!.setSuccess()
-      msg.retain()
-      ctx.fireChannelRead(msg)
+      //msg.retain()
+      //ctx.fireChannelRead(msg)
       handler.onOpen(client)
       return
     } else {
diff --git a/ts-core/ts-xml/build.gradle.kts b/ts-core/ts-xml/build.gradle.kts
index ee18eb1..10cc33e 100644
--- a/ts-core/ts-xml/build.gradle.kts
+++ b/ts-core/ts-xml/build.gradle.kts
@@ -25,7 +25,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-core/ts-yaml/build.gradle.kts b/ts-core/ts-yaml/build.gradle.kts
index 9dd3646..492d944 100644
--- a/ts-core/ts-yaml/build.gradle.kts
+++ b/ts-core/ts-yaml/build.gradle.kts
@@ -25,7 +25,7 @@ publishing {
 
             from(components["java"])
             try {
-                artifact(tasks["sourcesJar"])
+                artifact(tasks["kotlinSourcesJar"])
             } catch (e: Exception) {
             }
         }
diff --git a/ts-database/build.gradle.kts b/ts-database/build.gradle.kts
index 5914292..2342fa7 100644
--- a/ts-database/build.gradle.kts
+++ b/ts-database/build.gradle.kts
@@ -29,7 +29,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-database/ts-mongodb/build.gradle.kts b/ts-database/ts-mongodb/build.gradle.kts
index 4fb8158..ed643de 100644
--- a/ts-database/ts-mongodb/build.gradle.kts
+++ b/ts-database/ts-mongodb/build.gradle.kts
@@ -28,7 +28,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-database/ts-mongodb/ts-mongodb-spring/build.gradle.kts b/ts-database/ts-mongodb/ts-mongodb-spring/build.gradle.kts
index b3a14ab..5f4e1cd 100644
--- a/ts-database/ts-mongodb/ts-mongodb-spring/build.gradle.kts
+++ b/ts-database/ts-mongodb/ts-mongodb-spring/build.gradle.kts
@@ -25,7 +25,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-database/ts-redis/build.gradle.kts b/ts-database/ts-redis/build.gradle.kts
index 5655897..f854729 100644
--- a/ts-database/ts-redis/build.gradle.kts
+++ b/ts-database/ts-redis/build.gradle.kts
@@ -26,7 +26,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-socket/build.gradle.kts b/ts-socket/build.gradle.kts
index aca40e8..5257035 100644
--- a/ts-socket/build.gradle.kts
+++ b/ts-socket/build.gradle.kts
@@ -28,7 +28,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-web/build.gradle.kts b/ts-web/build.gradle.kts
index a5e90bf..ebb36a9 100644
--- a/ts-web/build.gradle.kts
+++ b/ts-web/build.gradle.kts
@@ -27,7 +27,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-web/ts-web-coroutine/build.gradle.kts b/ts-web/ts-web-coroutine/build.gradle.kts
index 84f1531..7e610ca 100644
--- a/ts-web/ts-web-coroutine/build.gradle.kts
+++ b/ts-web/ts-web-coroutine/build.gradle.kts
@@ -28,7 +28,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }
diff --git a/ts-web/ts-web-netty/build.gradle.kts b/ts-web/ts-web-netty/build.gradle.kts
index dcc3e56..0a2e69a 100644
--- a/ts-web/ts-web-netty/build.gradle.kts
+++ b/ts-web/ts-web-netty/build.gradle.kts
@@ -28,7 +28,7 @@ publishing {
 
       from(components["java"])
       try {
-        artifact(tasks["sourcesJar"])
+        artifact(tasks["kotlinSourcesJar"])
       } catch (e: Exception) {
       }
     }