Merge pull request #9 from simple-robot/dev/update-simbot

更新simbot核心库到4.0.0-RC3

.github/workflows/publish-release.yml

@@ -49,7 +49,7 @@ jobs:
           gradle-version: 8.5
           arguments: |
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info 
             --warning-mode all
             -x test
@@ -109,7 +109,7 @@ jobs:
           gradle-version: 8.5
           arguments: |
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info
             --warning-mode all
             -x test

.github/workflows/publish-snapshot.yml

@@ -61,7 +61,7 @@ jobs:
           arguments: |
             test 
             publishToSonatype
-            closeAndReleaseStagingRepository
+            closeAndReleaseStagingRepositories
             --info
             --warning-mode all
             -Porg.gradle.jvmargs="-Xmx8g -Xms2g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8" 

buildSrc/build.gradle.kts

@@ -34,7 +34,7 @@ dependencies {
     implementation(libs.bundles.dokka)
 
     // see https://github.com/gradle-nexus/publish-plugin
-    implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
+    implementation("io.github.gradle-nexus:publish-plugin:2.0.0")
 
     // simbot suspend transform gradle common
     implementation(libs.simbot.gradle)
@@ -45,9 +45,3 @@ dependencies {
     // gradle common
     implementation(libs.bundles.gradle.common)
 }
-
-//tasks.withType<KotlinCompile> {
-//    kotlinOptions {
-//        languageVersion = "2.0"
-//    }
-//}

buildSrc/src/main/kotlin/simbot-onebot-nexus-publish.gradle.kts

@@ -17,7 +17,7 @@
 
 import love.forte.gradle.common.core.project.setup
 import love.forte.gradle.common.core.repository.Repositories
-import love.forte.gradle.common.publication.configure.nexusPublishConfig
+import java.time.Duration
 
 plugins {
     id("io.github.gradle-nexus.publish-plugin")
@@ -31,10 +31,17 @@ if (userInfo == null) {
     logger.warn("sonatype.username or sonatype.password is null, cannot config nexus publishing.")
 }
 
-nexusPublishConfig {
-    projectDetail = P.ComponentOneBot
+nexusPublishing {
+    packageGroup.set(P.ComponentOneBot.group)
+    repositoryDescription.set(P.ComponentOneBot.description)
     useStaging = project.provider { !project.version.toString().endsWith("SNAPSHOT", ignoreCase = true) }
-    repositoriesConfig = {
+
+    transitionCheckOptions {
+        maxRetries = 1000
+        delayBetween = Duration.ofSeconds(2)
+    }
+
+    repositories {
         sonatype {
             snapshotRepositoryUrl.set(uri(Repositories.Snapshot.URL))
             username.set(userInfo?.username)

gradle/libs.versions.toml

@@ -2,19 +2,16 @@
 kotlin = "2.0.0"
 kotlinx-coroutines = "1.8.1"
 kotlinx-serialization = "1.6.3"
-kotlinx-datetime = "0.5.0"
 dokka = "1.9.20"
-okio = "3.3.0"
 ktor = "2.3.8"
 openjdk-jmh = "1.35"
 log4j = "2.20.0"
-reactor = "3.6.2"
 # simbot
-simbot = "4.0.0-RC2"
+simbot = "4.0.0-RC3"
 suspendTransform = "0.8.0-beta1"
 gradleCommon = "0.3.0"
 # ksp
-ksp = "2.0.0-1.0.21"
+ksp = "2.0.0-1.0.22"
 # https://square.github.io/kotlinpoet/
 kotlinPoet = "1.16.0"
 # https://mockk.io/
@@ -43,33 +40,16 @@ jetbrains-annotations = "org.jetbrains:annotations:24.1.0"
 
 # kotlinx-coroutines
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-jdk8 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-jdk8", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-reactive = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-reactive", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-reactor = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-reactor", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-rx2 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-rx2", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-rx3 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-rx3", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-guava = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-guava", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-slf4j = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-slf4j", version.ref = "kotlinx-coroutines" }
-kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-debug = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-debug", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 
 # kotlinx-serialization
 kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
-kotlinx-serialization-hocon = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-hocon", version.ref = "kotlinx-serialization" }
-kotlinx-serialization-protobuf = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-protobuf", version.ref = "kotlinx-serialization" }
-kotlinx-serialization-cbor = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-cbor", version.ref = "kotlinx-serialization" }
-kotlinx-serialization-properties = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-properties", version.ref = "kotlinx-serialization" }
-charleskorn-kaml = "com.charleskorn.kaml:kaml:0.49.0"
-
-# kotlinx-datetime
-kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinx-datetime" }
 
 # ktor
 ktor-serialization-kotlinxJson = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
-ktor-server-contentNegotiation = { group = "io.ktor", name = "ktor-server-content-negotiation", version.ref = "ktor" }
-ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref = "ktor" }
 
 ktor-client-contentNegotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-client-serialization = { group = "io.ktor", name = "ktor-client-serialization", version.ref = "ktor" }
@@ -90,9 +70,6 @@ ktor-client-winhttp = { group = "io.ktor", name = "ktor-client-winhttp", version
 # see https://ktor.io/docs/http-client-engines.html#darwin
 ktor-client-darwin = { group = "io.ktor", name = "ktor-client-darwin", version.ref = "ktor" }
 
-# nodejsn
-##kotlinx-odejs = ""
-
 # log4j
 log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
 log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
@@ -108,9 +85,6 @@ ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref =
 kotlinPoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinPoet" }
 kotlinPoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinPoet" }
 
-# reactor
-reactor-core = { group = "io.projectreactor", name = "reactor-core", version.ref = "reactor" }
-
 # dokka
 dokka-plugin = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version.ref = "dokka" }
 dokka-base = { group = "org.jetbrains.dokka", name = "dokka-base", version.ref = "dokka" }