Merge pull request #853 from simple-robot/pref-gradle-suspend-plugin

优化Gradle的挂起函数辅助插件的配置内容
simple-robot · Jun 15, 2024 · faf2941 · faf2941
2 parents b10dc1f + 1057130
commit faf2941
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git 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
@@ -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/...ransforms/src/main/kotlin/love/forte/simbot/gradle/suspendtransforms/SuspendTransforms.kt b/...ransforms/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,
+    )
+}