github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2024-12-27 17:10:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

[core] Revert "Review atomic calls and enable atomicfu compiler. Close #2315", due to atomicfu does not behave correctly when mirai-console depends on mirai-core-utils. Fixes #2329.

Browse Source 
This commit reverts part of commit 564a7ce8f8
This commit is contained in:
Him188 2022-11-27 20:05:43 +00:00
parent 65e49283a2
commit 60bbcf6e2c
No known key found for this signature in database
GPG Key ID: BA439CDDCF652375
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mirai-core-api/build.gradle.kts
View File

@ -14,7 +14,7 @@ plugins {
kotlin("multiplatform")
kotlin("plugin.serialization")
id("kotlinx-atomicfu")
//id("kotlinx-atomicfu")
id("signing")
id("me.him188.kotlin-jvm-blocking-bridge")
id("me.him188.kotlin-dynamic-delegation")
@ -43,6 +43,7 @@ kotlin {
implementation(project(":mirai-core-utils"))
implementation(project(":mirai-console-compiler-annotations"))
implementation(`kotlinx-serialization-protobuf`)
implementation(`kotlinx-atomicfu`)
compileOnly(`ktor-io`) // runtime from mirai-core-utils
}
}

1
mirai-core-utils/build.gradle.kts
View File

@ -35,6 +35,7 @@ kotlin {
api(`kotlinx-serialization-json`)
api(`kotlinx-coroutines-core`)
implementation(`kotlinx-atomicfu`)
implementation(`kotlinx-serialization-protobuf`)
relocateImplementation(`ktor-io_relocated`)
}

3
mirai-core/build.gradle.kts
View File

@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
plugins {
kotlin("multiplatform")
id("kotlinx-atomicfu")
// id("kotlinx-atomicfu")
kotlin("plugin.serialization")
id("me.him188.kotlin-jvm-blocking-bridge")
id("me.him188.kotlin-dynamic-delegation")
@ -43,6 +43,7 @@ kotlin {
implementation(project(":mirai-core-utils"))
implementation(`kotlinx-serialization-protobuf`)
implementation(`kotlinx-atomicfu`)
// relocateImplementation(`ktor-http_relocated`)
// relocateImplementation(`ktor-serialization_relocated`)