完善ksp2判断逻辑

Author: FlyJingFish

android-aop-apt/src/main/java/com/flyjingfish/android_aop_ksp/AndroidAopSymbolProcessor.kt

@@ -32,6 +32,7 @@ import com.google.devtools.ksp.symbol.KSFunctionDeclaration
 import com.google.devtools.ksp.symbol.KSType
 import com.google.devtools.ksp.symbol.Modifier
 import com.google.devtools.ksp.symbol.Origin
+import com.google.devtools.ksp.symbol.Variance
 import com.google.devtools.ksp.validate
 import com.google.gson.Gson
 import com.squareup.kotlinpoet.AnnotationSpec
@@ -594,7 +595,7 @@ class AndroidAopSymbolProcessor(private val codeGenerator: CodeGenerator,
       var collectClassName = if (isClazz){
         if (symbol.origin == Origin.KOTLIN){
           val checkType = "${parameter.type.resolve()}"
-          logger.error("=====$checkType")
+//          logger.error("=====$checkType")
           if (regexIsEmpty){
             if (!checkKotlinType(checkType)){
               throw IllegalArgumentException("$exceptionHintPreText 的 参数的泛型设置的不对")
@@ -606,37 +607,50 @@ class AndroidAopSymbolProcessor(private val codeGenerator: CodeGenerator,
           }
         }else if (symbol.origin == Origin.JAVA){
 //          logger.error("$exceptionHintPreText---${parameter.type}")
-          val checkType = "${parameter.type}"
-          logger.error("=====$checkType ==${parameter.type.resolve()}")
-          val paramName = parameter.name?.asString() ?: "<anonymous>"
+//          val checkType = "${parameter.type}"
           val typeRef = parameter.type
           val resolvedType = typeRef.resolve()
 
-          // 打印参数名和类型全名
-          logger.error("Parameter: $paramName, type: ${resolvedType.declaration.qualifiedName?.asString()}")
-
-          // 获取泛型参数列表
-          val typeArgs = resolvedType.arguments
-          if (typeArgs.isEmpty()) {
-            logger.error("  No generic parameters")
-          } else {
-            logger.error("  Generic parameters:")
-            for ((index, arg) in typeArgs.withIndex()) {
-              // arg 是 KSTypeArgument
-              val argType = arg.type?.resolve()
-              val argStr = argType?.declaration?.qualifiedName?.asString() ?: "StarProjection or Unknown"
-              logger.error("    [$index]: $argStr")
-            }
-          }
-          if (regexIsEmpty){
-            if (!checkJavaType(checkType)){
-              throw IllegalArgumentException("$exceptionJavaHintPreText 的 参数的泛型设置的不对")
+//          logger.error("Parameter: $paramName, type: ${resolvedType.declaration.qualifiedName?.asString()}")
+          if(resolvedType.arguments.size == 1){
+            val arg = resolvedType.arguments[0]
+            val variance = arg.variance
+//            val type = arg.type?.resolve()
+
+//            val typeName = type?.declaration?.qualifiedName?.asString() ?: ""
+//
+//            val varianceStr = when (variance) {
+//              Variance.INVARIANT -> "invariant (T)"
+//              Variance.COVARIANT -> "covariant (out T) -> ? extends"
+//              Variance.CONTRAVARIANT -> "contravariant (in T) -> ? super"
+//              else -> "unknown"
+//            }
+//            logger.error("$typeName, variance: $varianceStr")
+
+            if (regexIsEmpty){
+              if (variance != Variance.COVARIANT){
+                throw IllegalArgumentException("$exceptionJavaHintPreText 的 参数的泛型设置的不对")
+              }
+            }else{
+              if (variance == Variance.CONTRAVARIANT){
+                throw IllegalArgumentException("$exceptionJavaHintPreText 的 参数的泛型设置的不对")
+              }
             }
+
+
           }else{
-            if (checkJavaType1(checkType)){
-              throw IllegalArgumentException("$exceptionJavaHintPreText 的 参数的泛型设置的不对")
-            }
+            throw IllegalArgumentException("$exceptionJavaHintPreText 的 参数的泛型设置的不对，必须设置1个泛型")
           }
+
+//          if (regexIsEmpty){
+//            if (!checkJavaType(checkType)){
+//              throw IllegalArgumentException("$exceptionJavaHintPreText 的 参数的泛型设置的不对")
+//            }
+//          }else{
+//            if (checkJavaType1(checkType)){
+//              throw IllegalArgumentException("$exceptionJavaHintPreText 的 参数的泛型设置的不对")
+//            }
+//          }
         }
         val element = parameter.type.element
         if (element != null){

build.gradle

@@ -9,10 +9,10 @@ buildscript {
 plugins {
     id 'com.android.application' version '8.2.2' apply false
     id 'com.android.library' version '8.2.2' apply false
-    id 'org.jetbrains.kotlin.android' version '2.1.20' apply false
-    id 'org.jetbrains.kotlin.jvm' version '2.1.20' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
+    id 'org.jetbrains.kotlin.jvm' version '1.9.23' apply false
     id "com.vanniktech.maven.publish" version "0.33.0" apply false
-    id 'com.google.devtools.ksp' version '2.1.20-2.0.0' apply false
+    id 'com.google.devtools.ksp' version '1.9.23-1.0.20' apply false
     id 'io.github.flyjingfish.easyregister' version '1.1.0' apply false
     id 'com.gradle.plugin-publish' version '1.2.1' apply false
 //    id "kotlinx-serialization" version "1.5.0"