tursom/TursomServer
0
0
Fork 0
mirror of https://github.com/tursom/TursomServer.git synced 2025-01-29 22:01:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

update dependencies

Browse Source
This commit is contained in:
tursom 2022-01-06 15:29:32 +08:00
parent 370fb3d0f4
commit 3fb22b30bb
23 changed files with 63 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.6.0"
kotlin("jvm") version "1.6.10"
`maven-publish`
id("ts-gradle")
}

6
ts-core/build.gradle.kts
View File

@ -8,9 +8,9 @@ dependencies {
api(kotlin("stdlib-jdk8"))
api(kotlin("reflect"))
api(group = "org.slf4j", name = "slf4j-api", version = "1.7.32")
compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.7")
compileOnly(group = "io.netty", name = "netty-all", version = "4.1.67.Final")
compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.9")
compileOnly(group = "io.netty", name = "netty-all", version = "4.1.72.Final")
testApi(group = "junit", name = "junit", version = "4.13.2")
}

6
ts-core/ts-async-http/build.gradle.kts
View File

@ -9,13 +9,13 @@ dependencies {
api(project(":ts-core"))
api(project(":ts-core:ts-buffer"))
implementation(project(":ts-core:ts-xml"))
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
compileOnly("com.squareup.okhttp3:okhttp:4.9.1")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
compileOnly("com.squareup.okhttp3:okhttp:4.9.3")
//api(group = "com.squareup.retrofit2", name = "converter-gson", version = "2.9.0")
//api(group = "com.squareup.retrofit2", name = "retrofit", version = "2.9.0")
// https://mvnrepository.com/artifact/org.jsoup/jsoup
api(group = "org.jsoup", name = "jsoup", version = "1.14.2")
api(group = "org.jsoup", name = "jsoup", version = "1.14.3")
testImplementation(project(":ts-core:ts-coroutine"))

2
ts-core/ts-buffer/build.gradle.kts
View File

@ -7,7 +7,7 @@ plugins {
dependencies {
implementation(project(":ts-core:ts-log"))
implementation(project(":ts-core"))
compileOnly(group = "io.netty", name = "netty-all", version = "4.1.67.Final")
compileOnly(group = "io.netty", name = "netty-all", version = "4.1.72.Final")
}
artifacts {

2
ts-core/ts-coroutine/build.gradle.kts
View File

@ -6,7 +6,7 @@ plugins {
dependencies {
implementation(project(":ts-core"))
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
}

2
ts-core/ts-coroutine/ts-coroutine-lock/build.gradle.kts
View File

@ -6,7 +6,7 @@ plugins {
dependencies {
implementation(project(":ts-core"))
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
}

2
ts-core/ts-curry/build.gradle.kts
View File

@ -7,7 +7,7 @@ plugins {
dependencies {
implementation(project(":"))
implementation(project(":ts-core"))
testImplementation(group = "junit", name = "junit", version = "4.13")
testImplementation(group = "junit", name = "junit", version = "4.13.2")
}

2
ts-core/ts-delegation/build.gradle.kts
View File

@ -6,7 +6,7 @@ plugins {
dependencies {
api(project(":ts-core"))
compileOnly(group = "io.netty", name = "netty-all", version = "4.1.67.Final")
compileOnly(group = "io.netty", name = "netty-all", version = "4.1.72.Final")
}

27
ts-core/ts-delegation/src/main/kotlin/cn/tursom/core/delegation/ObjectLockMutableDelegatedField.kt Normal file
View File

@ -0,0 +1,27 @@
package cn.tursom.core.delegation
import java.util.concurrent.locks.Lock
import java.util.concurrent.locks.ReentrantLock
import kotlin.reflect.KProperty
class ObjectLockMutableDelegatedField<in T, V>(
override val delegatedField: MutableDelegatedField<T, V>,
private val lock: Any,
) : MutableDelegatedField<T, V> by delegatedField, DecoratorMutableDelegatedField<T, V> {
constructor(
initValue: V,
lock: Lock = ReentrantLock(),
) : this(MutableDelegatedFieldValue(initValue), lock)
override fun getValue(thisRef: T, property: KProperty<*>): V = synchronized(lock) {
delegatedField.getValue(thisRef, property)
}
override fun setValue(thisRef: T, property: KProperty<*>, value: V) = synchronized(lock) {
delegatedField.setValue(thisRef, property, value)
}
override fun valueOnSet(thisRef: T, property: KProperty<*>, value: V, oldValue: V) = synchronized(lock) {
delegatedField.valueOnSet(thisRef, property, value, oldValue)
}
}

3
ts-core/ts-delegation/src/main/kotlin/cn/tursom/core/delegation/delegations.kt
View File

@ -77,6 +77,9 @@ fun <T, V : Any> DelegatedField<T, V?>.notNull(ifNull: () -> Nothing): Delegated
fun <T, V : Any> MutableDelegatedField<T, out V?>.notNull(ifNull: () -> Nothing): MutableDelegatedField<T, V> =
NotNullMutableDelegatedField(uncheckedCast(), ifNull)
fun <T, V> MutableDelegatedField<T, V>.objectLocked(lock: Any): MutableDelegatedField<T, V> =
ObjectLockMutableDelegatedField(this, lock)
val <T, V> MutableDelegatedField<T, V>.locked: MutableDelegatedField<T, V> get() = LockMutableDelegatedField(this)
fun <T, V> MutableDelegatedField<T, V>.locked(lock: Lock = ReentrantLock()): MutableDelegatedField<T, V> =
LockMutableDelegatedField(this, lock)

6
ts-core/ts-json/build.gradle.kts
View File

@ -6,9 +6,9 @@ plugins {
dependencies {
implementation(project(":"))
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.7")
compileOnly(group = "com.fasterxml.jackson.core", name = "jackson-core", version = "2.12.4")
compileOnly(group = "com.fasterxml.jackson.core", name = "jackson-databind", version = "2.12.4")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.9")
compileOnly(group = "com.fasterxml.jackson.core", name = "jackson-core", version = "2.13.1")
compileOnly(group = "com.fasterxml.jackson.core", name = "jackson-databind", version = "2.13.1")
}

6
ts-core/ts-log/build.gradle.kts
View File

@ -8,10 +8,10 @@ dependencies {
implementation(project(":ts-core"))
implementation(project(":ts-core:ts-delegation"))
api(group = "org.slf4j", name = "slf4j-api", version = "1.7.32")
api(group = "ch.qos.logback", name = "logback-core", version = "1.2.5")
api(group = "ch.qos.logback", name = "logback-classic", version = "1.2.5")
api(group = "ch.qos.logback", name = "logback-core", version = "1.2.10")
api(group = "ch.qos.logback", name = "logback-classic", version = "1.2.10")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.7")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.9")
}

2
ts-core/ts-ws-client/build.gradle.kts
View File

@ -9,7 +9,7 @@ dependencies {
api(project(":ts-core:ts-buffer"))
api(project(":ts-core:ts-log"))
compileOnly(project(":ts-socket"))
api(group = "io.netty", name = "netty-all", version = nettyVersion)
api(group = "io.netty", name = "netty-all", version = "4.1.72.Final")
}

4
ts-database/build.gradle.kts
View File

@ -12,8 +12,8 @@ dependencies {
implementation(project(":ts-core:ts-clone"))
implementation(project(":ts-core:ts-log"))
api(group = "org.ktorm", name = "ktorm-core", version = "3.4.1")
compileOnly(group = "com.baomidou", name = "mybatis-plus", version = "3.4.3.1")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.7")
compileOnly(group = "com.baomidou", name = "mybatis-plus", version = "3.4.3.4")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.9")
testApi(group = "junit", name = "junit", version = "4.13.2")
}

2
ts-database/ts-ktorm/build.gradle.kts
View File

@ -12,7 +12,7 @@ dependencies {
implementation(project(":ts-core:ts-clone"))
implementation(project(":ts-core:ts-log"))
api(group = "org.ktorm", name = "ktorm-core", version = "3.4.1")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.7")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.9")
testApi(group = "junit", name = "junit", version = "4.13.2")
}

4
ts-database/ts-mongodb/build.gradle.kts
View File

@ -9,8 +9,8 @@ dependencies {
implementation(project(":ts-core"))
implementation(project(":ts-core:ts-datastruct"))
implementation(project(":ts-core:ts-log"))
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
api(group = "org.mongodb", name = "mongodb-driver-reactivestreams", version = "4.3.0")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
api(group = "org.mongodb", name = "mongodb-driver-reactivestreams", version = "4.4.0")
}

3
ts-database/ts-mongodb/src/main/kotlin/cn/tursom/database/mongodb/operator/CachedInsertMongoOperator.kt
View File

@ -59,7 +59,8 @@ class CachedInsertMongoOperator<T : Any>(
@Suppress("EXPERIMENTAL_API_USAGE")
while (!documentChannel.isClosedForReceive) {
try {
list.add(documentChannel.poll() ?: withTimeout(maxDelayTimeMS) { documentChannel.receive() })
list.add(
documentChannel.tryReceive().getOrNull() ?: withTimeout(maxDelayTimeMS) { documentChannel.receive() })
received.incrementAndGet()
} catch (e: TimeoutCancellationException) {
} catch (e: ClosedReceiveChannelException) {

2
ts-database/ts-mongodb/ts-mongodb-spring/build.gradle.kts
View File

@ -7,7 +7,7 @@ plugins {
dependencies {
api(project(":"))
implementation(project(":ts-core"))
compileOnly(group = "org.springframework.data", name = "spring-data-mongodb", version = "3.2.4")
compileOnly(group = "org.springframework.data", name = "spring-data-mongodb", version = "3.3.0")
}

4
ts-database/ts-mybatisplus/build.gradle.kts
View File

@ -11,8 +11,8 @@ dependencies {
implementation(project(":ts-core"))
implementation(project(":ts-core:ts-clone"))
implementation(project(":ts-core:ts-log"))
implementation(group = "com.baomidou", name = "mybatis-plus", version = "3.4.3.2")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.7")
implementation(group = "com.baomidou", name = "mybatis-plus", version = "3.4.3.4")
compileOnly(group = "com.google.code.gson", name = "gson", version = "2.8.9")
testApi(group = "junit", name = "junit", version = "4.13.2")
}

2
ts-database/ts-redis/build.gradle.kts
View File

@ -8,7 +8,7 @@ dependencies {
api(project(":"))
implementation(project(":ts-core"))
implementation(project(":ts-core:ts-log"))
api(group = "redis.clients", name = "jedis", version = "3.6.3")
api(group = "redis.clients", name = "jedis", version = "3.3.0")
}

2
ts-socket/build.gradle.kts
View File

@ -10,7 +10,7 @@ dependencies {
implementation(project(":ts-core:ts-buffer"))
implementation(project(":ts-core:ts-pool"))
implementation(project(":ts-core:ts-log"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
}

2
ts-web/ts-web-coroutine/build.gradle.kts
View File

@ -11,7 +11,7 @@ dependencies {
implementation(project(":ts-core:ts-buffer"))
implementation(project(":ts-core:ts-json"))
implementation(group = "org.slf4j", name = "slf4j-api", version = "1.7.32")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
}

2
ts-web/ts-web-netty/build.gradle.kts
View File

@ -9,7 +9,7 @@ dependencies {
api(project(":ts-core:ts-buffer"))
api(project(":ts-core:ts-log"))
api(project(":ts-web"))
api(group = "io.netty", name = "netty-all", version = nettyVersion)
api(group = "io.netty", name = "netty-all", version = "4.1.72.Final")
api(group = "org.slf4j", name = "slf4j-api", version = "1.7.32")
}