Skip to content

Kotlin更新到v1.8.21 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2023
Merged

Kotlin更新到v1.8.21 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {
gradlePluginPortal()
}

val kotlinVersion = "1.8.10"
val kotlinVersion = "1.8.21"
val dokkaPluginVersion = "1.8.10"
val gradleCommon = "0.0.11"

Expand Down
25 changes: 10 additions & 15 deletions ...kotlin/love/forte/plugin/suspendtrans/symbol/SuspendTransformSyntheticResolveExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl
import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.js.descriptorUtils.getJetTypeFqName
import org.jetbrains.kotlin.js.descriptorUtils.getKotlinTypeFqName
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.platform.isCommon
import org.jetbrains.kotlin.platform.js.isJs
import org.jetbrains.kotlin.platform.isJs
import org.jetbrains.kotlin.platform.jvm.isJvm
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.constants.ArrayValue
Expand Down Expand Up @@ -193,19 +193,13 @@ open class SuspendTransformSyntheticResolveExtension(open val configuration: Sus

fun check(): Boolean {
val platform = classDescriptor.platform
if (platform.isJvm() && targetPlatform == TargetPlatform.JVM) {
return true
}

if (platform.isJs() && targetPlatform == TargetPlatform.JS) {
return true
}

if (platform.isCommon() && targetPlatform == TargetPlatform.COMMON) {
return true
return when {
platform.isJvm() && targetPlatform == TargetPlatform.JVM -> true
platform.isJs() && targetPlatform == TargetPlatform.JS -> true
platform.isCommon() && targetPlatform == TargetPlatform.COMMON -> true
else -> false
}

return false
}

platform.isCommon()
Expand Down Expand Up @@ -318,9 +312,10 @@ private fun SimpleFunctionDescriptor.toGeneratedByDescriptorInfo(): List<StringV
add(d.name.sv)
d.allParameters.forEach {
add(it.name.sv)
add(it.type.getJetTypeFqName(true).sv)
// add(it.type.getJetTypeFqName(true).sv)
add(it.type.getKotlinTypeFqName(true).sv)
}
add(d.returnType?.getJetTypeFqName(true)?.sv ?: "?".sv)
add(d.returnType?.getKotlinTypeFqName(true)?.sv ?: "?".sv)
}

}
Expand Down
Loading