diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt index 05f84ac54..ab47fec45 100644 --- a/buildSrc/src/main/kotlin/P.kt +++ b/buildSrc/src/main/kotlin/P.kt @@ -85,7 +85,7 @@ sealed class P(override val group: String) : ProjectDetail() { val versionWithoutSnapshot: Version init { - val mainVersion = version(4, 0, 0) + val mainVersion = version(4, 0, 1) fun initVersionWithoutSnapshot(status: Version?): Version = if (status == null) { mainVersion diff --git a/simbot-gradles/simbot-gradle-suspendtransforms/api/simbot-gradle-suspendtransforms.api b/simbot-gradles/simbot-gradle-suspendtransforms/api/simbot-gradle-suspendtransforms.api index e170ef324..2892e5171 100644 --- a/simbot-gradles/simbot-gradle-suspendtransforms/api/simbot-gradle-suspendtransforms.api +++ b/simbot-gradles/simbot-gradle-suspendtransforms/api/simbot-gradle-suspendtransforms.api @@ -13,3 +13,7 @@ public final class love/forte/simbot/gradle/suspendtransforms/SuspendTransforms public final fun getSuspendTransTransformerForJvmReserve ()Llove/forte/plugin/suspendtrans/Transformer; } +public final class love/forte/simbot/gradle/suspendtransforms/SuspendTransformsKt { + public static final fun addSimbotJvmTransformers (Llove/forte/plugin/suspendtrans/SuspendTransformConfiguration;)V +} + diff --git a/simbot-gradles/simbot-gradle-suspendtransforms/src/main/kotlin/love/forte/simbot/gradle/suspendtransforms/SuspendTransforms.kt b/simbot-gradles/simbot-gradle-suspendtransforms/src/main/kotlin/love/forte/simbot/gradle/suspendtransforms/SuspendTransforms.kt index 25927a230..56bf275e0 100644 --- a/simbot-gradles/simbot-gradle-suspendtransforms/src/main/kotlin/love/forte/simbot/gradle/suspendtransforms/SuspendTransforms.kt +++ b/simbot-gradles/simbot-gradle-suspendtransforms/src/main/kotlin/love/forte/simbot/gradle/suspendtransforms/SuspendTransforms.kt @@ -58,10 +58,13 @@ import love.forte.plugin.suspendtrans.* public object SuspendTransforms { private val javaIncludeAnnotationApi4JClassInfo = ClassInfo("love.forte.simbot.annotations", "Api4J") private val javaIncludeAnnotationApi4J = IncludeAnnotation(javaIncludeAnnotationApi4JClassInfo) + .apply { includeProperty = true } + private val javaIncludeAnnotations = listOf(javaIncludeAnnotationApi4J) private val jsIncludeAnnotationApi4JsClassInfo = ClassInfo("love.forte.simbot.annotations", "Api4Js") private val jsIncludeAnnotationApi4Js = IncludeAnnotation(jsIncludeAnnotationApi4JsClassInfo) + .apply { includeProperty = true } // TODO private val jsIncludeAnnotations = listOf(jsIncludeAnnotationApi4Js) @@ -218,10 +221,36 @@ public object SuspendTransforms { jvmSuspendTransPropMarkAnnotationForReserve.classInfo ) //endregion - - } +/** + * 添加: + * - [SuspendTransforms.jvmBlockingTransformer] + * - [SuspendTransforms.jvmAsyncTransformer] + * - [SuspendTransforms.suspendTransTransformerForJvmBlocking] + * - [SuspendTransforms.suspendTransTransformerForJvmAsync] + * - [SuspendTransforms.suspendTransTransformerForJvmReserve] + * - [SuspendTransforms.jvmSuspendTransPropTransformerForBlocking] + * - [SuspendTransforms.jvmSuspendTransPropTransformerForAsync] + * - [SuspendTransforms.jvmSuspendTransPropTransformerForReserve] + */ +public fun SuspendTransformConfiguration.addSimbotJvmTransformers() { + addJvmTransformers( + // @JvmBlocking + SuspendTransforms.jvmBlockingTransformer, + // @JvmAsync + SuspendTransforms.jvmAsyncTransformer, + + // @JvmSuspendTrans + SuspendTransforms.suspendTransTransformerForJvmBlocking, + SuspendTransforms.suspendTransTransformerForJvmAsync, + SuspendTransforms.suspendTransTransformerForJvmReserve, + // @JvmSuspendTransProperty + SuspendTransforms.jvmSuspendTransPropTransformerForBlocking, + SuspendTransforms.jvmSuspendTransPropTransformerForAsync, + SuspendTransforms.jvmSuspendTransPropTransformerForReserve, + ) +}