Skip to content

Commit

Permalink
Merge pull request #116 from simple-robot/upgrade-simbot-dev18
Browse files Browse the repository at this point in the history
更新 simbot 到 v4.0.0-dev18; 更新 kotlinx.coroutines 到 v1.8.0-RC2
  • Loading branch information
ForteScarlet authored Feb 6, 2024
2 parents f2e702b + e62a37f commit c23c4fd
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 9 deletions.
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
kotlin = "1.9.22"
kotlinx-coroutines = "1.7.3"
kotlinx-coroutines = "1.8.0-RC2"
kotlinx-serialization = "1.6.2"
kotlinx-datetime = "0.5.0"
dokka = "1.9.10"
Expand All @@ -10,7 +10,7 @@ openjdk-jmh = "1.35"
log4j = "2.20.0"
reactor = "3.6.2"
# simbot
simbot = "4.0.0-dev15"
simbot = "4.0.0-dev18"
suspendTransform = "0.7.0-beta1"
gradleCommon = "0.2.0"
# ksp
Expand All @@ -31,7 +31,7 @@ simbot-common-core = { group = "love.forte.simbot.common", name = "simbot-common
simbot-common-suspend = { group = "love.forte.simbot.common", name = "simbot-common-suspend-runner", version.ref = "simbot" }
simbot-common-annotations = { group = "love.forte.simbot.common", name = "simbot-common-annotations", version.ref = "simbot" }
simbot-common-loop = { group = "love.forte.simbot.common", name = "simbot-common-stage-loop", version.ref = "simbot" }
simbot-gradle = { group = "love.forte.simbot.gradle", name = "simbot-gradle-suspendtransforms", version = "4.0.0-dev15" }
simbot-gradle = { group = "love.forte.simbot.gradle", name = "simbot-gradle-suspendtransforms", version.ref = "simbot" }

# jetbrains-annotation
jetbrains-annotations = "org.jetbrains:annotations:24.0.1"
Expand Down
1 change: 1 addition & 0 deletions simbot-component-qq-guild-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ kotlin {

commonTest.dependencies {
implementation(kotlin("test"))
implementation(libs.kotlinx.coroutines.debug)
implementation(libs.kotlinx.coroutines.test)
// https://ktor.io/docs/http-client-testing.html
implementation(libs.ktor.client.mock)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ package love.forte.simbot.component.qguild.internal.forum

import love.forte.simbot.ability.DeleteFailureException
import love.forte.simbot.ability.DeleteOption
import love.forte.simbot.ability.StandardDeleteOption.*
import love.forte.simbot.ability.StandardDeleteOption.Companion.standardAnalysis
import love.forte.simbot.ability.StandardDeleteOption.IGNORE_ON_FAILURE
import love.forte.simbot.ability.StandardDeleteOption.IGNORE_ON_NO_SUCH_TARGET
import love.forte.simbot.ability.isIgnoreOnFailure
import love.forte.simbot.component.qguild.forum.QGThread
import love.forte.simbot.component.qguild.guild.QGMember
import love.forte.simbot.component.qguild.internal.bot.QGBotImpl
Expand Down Expand Up @@ -72,7 +74,7 @@ internal class QGThreadImpl(
return
}

if (IGNORE_ON_ANY_FAILURE !in stdOpts) {
if (!stdOpts.isIgnoreOnFailure) {
throw e
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ import io.ktor.util.internal.*
import kotlinx.coroutines.flow.map
import love.forte.simbot.ability.DeleteFailureException
import love.forte.simbot.ability.DeleteOption
import love.forte.simbot.ability.StandardDeleteOption.*
import love.forte.simbot.ability.StandardDeleteOption.Companion.standardAnalysis
import love.forte.simbot.ability.StandardDeleteOption.IGNORE_ON_FAILURE
import love.forte.simbot.ability.StandardDeleteOption.IGNORE_ON_NO_SUCH_TARGET
import love.forte.simbot.ability.isIgnoreOnFailure
import love.forte.simbot.common.collectable.Collectable
import love.forte.simbot.common.collectable.asCollectable
import love.forte.simbot.common.id.ID
Expand Down Expand Up @@ -96,7 +98,7 @@ internal class QGGuildRoleImpl(
return
}

if (IGNORE_ON_ANY_FAILURE !in stdOpts) {
if (!stdOpts.isIgnoreOnFailure) {
throw e
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ package love.forte.simbot.component.qguild.internal.role

import love.forte.simbot.ability.DeleteFailureException
import love.forte.simbot.ability.DeleteOption
import love.forte.simbot.ability.StandardDeleteOption.*
import love.forte.simbot.ability.StandardDeleteOption.Companion.standardAnalysis
import love.forte.simbot.ability.StandardDeleteOption.IGNORE_ON_FAILURE
import love.forte.simbot.ability.StandardDeleteOption.IGNORE_ON_NO_SUCH_TARGET
import love.forte.simbot.ability.isIgnoreOnFailure
import love.forte.simbot.common.id.ID
import love.forte.simbot.common.id.literal
import love.forte.simbot.component.qguild.ExperimentalQGApi
Expand Down Expand Up @@ -82,7 +84,7 @@ internal class QGMemberRoleImpl(
return
}

if (IGNORE_ON_ANY_FAILURE !in stdOpts) {
if (!stdOpts.isIgnoreOnFailure) {
throw e
}
}
Expand Down

0 comments on commit c23c4fd

Please sign in to comment.