From 37bc5eed649c4d8d4044c6f73c244dd81f1eeb7d Mon Sep 17 00:00:00 2001 From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com> Date: Mon, 8 Dec 2025 18:53:03 +0800 Subject: [PATCH 1/2] netty 4.1.118, tika 3.2.3 --- build.gradle.kts | 12 ++++-------- examples/echo-server/build.gradle.kts | 11 +---------- examples/file-server/build.gradle.kts | 11 +---------- examples/hello-world/build.gradle.kts | 11 +---------- examples/zip-server/build.gradle.kts | 11 +---------- gradle/libs.versions.toml | 24 ++++++++++++++++++++++++ 6 files changed, 32 insertions(+), 48 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/build.gradle.kts b/build.gradle.kts index 28d956f..84054f6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,14 +27,10 @@ kotlin { } dependencies { - // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core - implementation("org.apache.logging.log4j:log4j-core:2.23.1") - // https://mvnrepository.com/artifact/io.netty/netty-all - implementation("io.netty:netty-all:4.1.115.Final") - // https://mvnrepository.com/artifact/com.google.code.gson/gson - implementation("com.google.code.gson:gson:2.10.1") - // https://mvnrepository.com/artifact/org.apache.tika/tika-core - implementation("org.apache.tika:tika-core:2.9.2") + api(libs.log4j.core) + api(libs.bundles.netty) + api(libs.gson) + api(libs.tika.core) testImplementation(kotlin("test")) testImplementation("com.squareup.retrofit2:retrofit:2.9.0") diff --git a/examples/echo-server/build.gradle.kts b/examples/echo-server/build.gradle.kts index c8e4544..c944f67 100644 --- a/examples/echo-server/build.gradle.kts +++ b/examples/echo-server/build.gradle.kts @@ -19,16 +19,7 @@ kotlin { } dependencies { - implementation(project(":")) - - // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core - implementation("org.apache.logging.log4j:log4j-core:2.23.1") - // https://mvnrepository.com/artifact/io.netty/netty-all - implementation("io.netty:netty-all:4.1.82.Final") - // https://mvnrepository.com/artifact/com.google.code.gson/gson - implementation("com.google.code.gson:gson:2.10.1") - // https://mvnrepository.com/artifact/org.apache.tika/tika-core - implementation("org.apache.tika:tika-core:2.9.2") + implementation(rootProject) } application { diff --git a/examples/file-server/build.gradle.kts b/examples/file-server/build.gradle.kts index 521dd5b..9db40bd 100644 --- a/examples/file-server/build.gradle.kts +++ b/examples/file-server/build.gradle.kts @@ -19,16 +19,7 @@ kotlin { } dependencies { - implementation(project(":")) - - // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core - implementation("org.apache.logging.log4j:log4j-core:2.23.1") - // https://mvnrepository.com/artifact/io.netty/netty-all - implementation("io.netty:netty-all:4.1.82.Final") - // https://mvnrepository.com/artifact/com.google.code.gson/gson - implementation("com.google.code.gson:gson:2.10.1") - // https://mvnrepository.com/artifact/org.apache.tika/tika-core - implementation("org.apache.tika:tika-core:2.9.2") + implementation(rootProject) } application { diff --git a/examples/hello-world/build.gradle.kts b/examples/hello-world/build.gradle.kts index 1ad5bb3..4a9704a 100644 --- a/examples/hello-world/build.gradle.kts +++ b/examples/hello-world/build.gradle.kts @@ -19,16 +19,7 @@ kotlin { } dependencies { - implementation(project(":")) - - // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core - implementation("org.apache.logging.log4j:log4j-core:2.23.1") - // https://mvnrepository.com/artifact/io.netty/netty-all - implementation("io.netty:netty-all:4.1.82.Final") - // https://mvnrepository.com/artifact/com.google.code.gson/gson - implementation("com.google.code.gson:gson:2.10.1") - // https://mvnrepository.com/artifact/org.apache.tika/tika-core - implementation("org.apache.tika:tika-core:2.9.2") + implementation(rootProject) } application { diff --git a/examples/zip-server/build.gradle.kts b/examples/zip-server/build.gradle.kts index 1ad5bb3..4a9704a 100644 --- a/examples/zip-server/build.gradle.kts +++ b/examples/zip-server/build.gradle.kts @@ -19,16 +19,7 @@ kotlin { } dependencies { - implementation(project(":")) - - // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core - implementation("org.apache.logging.log4j:log4j-core:2.23.1") - // https://mvnrepository.com/artifact/io.netty/netty-all - implementation("io.netty:netty-all:4.1.82.Final") - // https://mvnrepository.com/artifact/com.google.code.gson/gson - implementation("com.google.code.gson:gson:2.10.1") - // https://mvnrepository.com/artifact/org.apache.tika/tika-core - implementation("org.apache.tika:tika-core:2.9.2") + implementation(rootProject) } application { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..0f23e8d --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,24 @@ +[versions] +# https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core +log4j = "2.23.1" +# https://mvnrepository.com/artifact/io.netty/netty-all +netty = "4.1.118.Final" +# https://mvnrepository.com/artifact/com.google.code.gson/gson +gson = "2.10.1" +# https://mvnrepository.com/artifact/org.apache.tika/tika-core +tika = "3.2.3" + +[libraries] +log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" } +netty-codec-http = { module = "io.netty:netty-codec-http", version.ref = "netty" } +netty-kqueue-classes = { module = "io.netty:netty-transport-classes-kqueue", version.ref = "netty" } +netty-epoll-classes = { module = "io.netty:netty-transport-classes-epoll", version.ref = "netty" } +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } +tika-core = { module = "org.apache.tika:tika-core", version.ref = "tika" } + +[bundles] +netty = [ + "netty-codec-http", + "netty-kqueue-classes", + "netty-epoll-classes" +] From bb3ff7c346436fd77ace7af35a47aec68f596dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=A8=E8=91=89=20Scarlet?= <93977077+mukjepscarlet@users.noreply.github.com> Date: Mon, 8 Dec 2025 22:26:55 +0800 Subject: [PATCH 2/2] fix Gradle deprecation warning --- build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 84054f6..9265f0a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -62,12 +62,12 @@ tasks.withType { } } -val sourcesJar by tasks.creating(Jar::class) { +val sourcesJar by tasks.registering(Jar::class) { archiveClassifier.set("sources") from(sourceSets.main.get().allSource) } -val javadocJar by tasks.creating(Jar::class) { +val javadocJar by tasks.registering(Jar::class) { archiveClassifier.set("javadoc") from(tasks.javadoc) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0f23e8d..b8d4db2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,8 +7,12 @@ netty = "4.1.118.Final" gson = "2.10.1" # https://mvnrepository.com/artifact/org.apache.tika/tika-core tika = "3.2.3" +# https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-test/overview +kotlinx_coroutines_version = "1.10.2" [libraries] +coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx_coroutines_version" } +coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx_coroutines_version" } log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" } netty-codec-http = { module = "io.netty:netty-codec-http", version.ref = "netty" } netty-kqueue-classes = { module = "io.netty:netty-transport-classes-kqueue", version.ref = "netty" }