Merge pull request #13 from ltttttttttttt/dev

增加对Compose可变性注解的支持,如果原Bean带有 @stable 或 @immutable 注解,则生成的Buff类也带有相应注解

Author: ltttttttttttt

Buff-lib/build.gradle.kts

@@ -18,7 +18,7 @@ kotlin {
     jvm {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "11"
+                jvmTarget = "17"
             }
         }
     }
@@ -78,7 +78,7 @@ android {
         sourceSets["main"].res.srcDir("resources")
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }

Buff/src/jvmMain/kotlin/com/lt/buff/Util.kt

@@ -1,6 +1,7 @@
 package com.lt.buff
 
 import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
+import com.google.devtools.ksp.symbol.KSAnnotation
 import com.google.devtools.ksp.symbol.KSTypeReference
 import com.google.devtools.ksp.symbol.Nullability
 import com.lt.buff.options.KSTypeInfo
@@ -41,7 +42,11 @@ internal fun String?.w(environment: SymbolProcessorEnvironment) {
  * [options] 用户的配置
  * [isFirstFloor] 是否是最外层,用于判断泛型
  */
-internal fun getKSTypeInfo(ks: KSTypeReference, options: KspOptions, isFirstFloor: Boolean = true): KSTypeInfo {
+internal fun getKSTypeInfo(
+    ks: KSTypeReference,
+    options: KspOptions,
+    isFirstFloor: Boolean = true
+): KSTypeInfo {
     //type对象
     val ksType = ks.resolve()
     //类是否有Buff注解
@@ -96,4 +101,22 @@ internal fun getKSTypeInfo(ks: KSTypeReference, options: KspOptions, isFirstFloo
         typeString,
         isList
     )
+}
+
+/**
+ * 获取注解的全类名
+ */
+internal fun getAnnotationFullClassName(ksa: KSAnnotation): String {
+    val ksType = ksa.annotationType.resolve()
+    //完整type字符串
+    return ksType.declaration.let {
+        val name = it.qualifiedName?.asString()
+        if (name != null)
+            return@let name
+        val packageName = it.packageName.asString()
+        return@let if (packageName.isEmpty())
+            ksa.shortName.asString()
+        else
+            "$packageName.${it.simpleName.asString()}"
+    }
 }

Buff/src/jvmMain/kotlin/com/lt/buff/provider/BuffVisitor.kt

@@ -5,6 +5,7 @@ import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSVisitorVoid
 import com.lt.buff.appendText
+import com.lt.buff.getAnnotationFullClassName
 import com.lt.buff.getKSTypeInfo
 import com.lt.buff.options.CustomOptionsInfo
 import com.lt.buff.options.FunctionFieldsInfo
@@ -28,6 +29,13 @@ internal class BuffVisitor(private val environment: SymbolProcessorEnvironment)
         val fullName = classDeclaration.qualifiedName?.asString()
             ?: (classDeclaration.packageName.asString() + classDeclaration.simpleName.asString())
         val className = "$originalClassName${options.suffix}"
+        val haveStable = classDeclaration.annotations.find {
+            getAnnotationFullClassName(it) == "androidx.compose.runtime.Stable"
+        } != null
+        val haveImmutable = classDeclaration.annotations.find {
+            getAnnotationFullClassName(it) == "androidx.compose.runtime.Immutable"
+        } != null
+
         val file = environment.codeGenerator.createNewFile(
             Dependencies(
                 true,
@@ -40,9 +48,15 @@ internal class BuffVisitor(private val environment: SymbolProcessorEnvironment)
             "import androidx.compose.runtime.MutableState\n" +
                     "import androidx.compose.runtime.mutableStateListOf\n" +
                     "import androidx.compose.runtime.mutableStateOf\n" +
+                    "import androidx.compose.runtime.Stable\n" +
+                    "import androidx.compose.runtime.Immutable\n" +
                     "import androidx.compose.runtime.snapshots.SnapshotStateList\n" +
                     "import androidx.compose.runtime.toMutableStateList\n\n"
         )
+        if (haveStable)
+            file.appendText("@Stable\n")
+        if (haveImmutable)
+            file.appendText("@Immutable\n")
         file.appendText(
             "${options.getClassSerializeAnnotation()}\n" +
                     "class $className @Deprecated(\"Do not directly call the constructor, instead use addBuff()\") constructor(\n"

README.md

@@ -2,7 +2,7 @@
 
 <p align="center">Add status to beans in Jetpack(jb) Compose, Fields in beans can be directly used as the MutableState&lt;T&gt;</p>
 
-<p>⚠️Non mainstream warning:This item violates 'Unique trusted data source' and 'FP',If the content on this page causes your discomfort,please press Ctrl+W</p>
+<p align="center">⚠️Non mainstream warning:If the content on this page causes your discomfort,please press Ctrl+W</p>
 
 <p align="center">
 <img src="https://img.shields.io/badge/Kotlin-Multiplatform-%237f52ff?logo=kotlin">
@@ -109,3 +109,5 @@ ksp {
     arg("customInFileWithBuff", "//File end")//in file
 }
 ```
+
+The project provides support for Compose variability annotations. If the original bean has @Stable or @Immutable annotations, the generated Buff class also has corresponding annotations

README_CN.md

@@ -2,7 +2,7 @@
 
 <p align="center">将beans中的某些字段转换为可以直接使用的MutableState&lt;T&gt;,适用于Jetpack(jb) Compose</p>
 
-<p>⚠️非主流警告:此项目违背了'唯一可信数据源'和'函数式编程思想',若此页面所述内容引起了您的不适,请按下Ctrl+W</p>
+<p align="center">⚠️非主流警告:若此页面所述内容引起了您的不适,请按下Ctrl+W</p>
 
 <p align="center">
 <img src="https://img.shields.io/badge/Kotlin-Multiplatform-%237f52ff?logo=kotlin">
@@ -107,3 +107,5 @@ ksp {
     arg("customInFileWithBuff", "//File end")//类外,kt文件内
 }
 ```
+
+项目提供了对Compose可变性注解的支持,如果原Bean带有 @Stable 或 @Immutable 注解,则生成的Buff类也带有相应注解

app/build.gradle.kts

@@ -53,11 +53,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
         compose = true

app/src/main/java/com/lt/buffapp/UseBuff.kt

@@ -5,6 +5,8 @@ import androidx.compose.material.Button
 import androidx.compose.material.Text
 import androidx.compose.material.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.remember
 import com.lt.buff.Buff
 import com.lt.buffapp.ui.theme.Type
@@ -34,6 +36,7 @@ fun ColumnScope.UseBuff() {
 
 @kotlinx.serialization.Serializable
 @Buff
+@Stable
 class BuffBean(
     val id: Int? = null,
     var info2: InfoBean? = null,

buildSrc/src/main/kotlin/Versions.kt

@@ -3,4 +3,4 @@ const val composeVersion = "1.4.0"//compose版本
 const val composeCompilerVersion = "1.4.5"//compose编译版本
 const val kspVersion = "$kotlinVersion-1.0.10"//ksp版本
 
-const val mVersion = "1.0.1"//此库的版本
+const val mVersion = "1.0.2"//此库的版本

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Oct 19 11:47:39 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -33,8 +33,8 @@ android {
         targetSdk = 31
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     lint {
         checkDependencies = true//开启 lint 性能优化