Merge branch '2.x'

# Conflicts: # build.gradle # gradle.properties
lets-mica · Oct 13, 2023 · b65d2c8 · b65d2c8
2 parents 9be9dda + 034ea7a
commit b65d2c8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,11 +3,11 @@ apply from: "${rootProject.projectDir}/gradle/publish-maven.gradle"
 
 ext {
     javaVersion = JavaVersion.VERSION_17
-    springBootVersion = "3.1.1"
-    lombokVersion = "1.18.28"
-    googleAutoVersion = "1.0.1"
+    springBootVersion = "3.1.4"
+    lombokVersion = "1.18.30"
+    googleAutoVersion = "1.1.1"
     compileTestingVersion = '0.21.0'
-    incapVersion = "0.3"
+    inCapVersion = "1.0.0"
 }
 
 group = GROUPID
@@ -31,13 +31,18 @@ dependencies {
     annotationProcessor "org.projectlombok:lombok:$lombokVersion"
     compileOnly "com.google.auto.service:auto-service:$googleAutoVersion"
     annotationProcessor "com.google.auto.service:auto-service:$googleAutoVersion"
-    compileOnly "net.ltgt.gradle.incap:incap:$incapVersion"
-    annotationProcessor "net.ltgt.gradle.incap:incap-processor:$incapVersion"
+    compileOnly "net.ltgt.gradle.incap:incap:$inCapVersion"
+    annotationProcessor "net.ltgt.gradle.incap:incap-processor:$inCapVersion"
     testImplementation "com.google.testing.compile:compile-testing:$compileTestingVersion"
-    testImplementation "net.ltgt.gradle.incap:incap:$incapVersion"
+    testImplementation "net.ltgt.gradle.incap:incap:$inCapVersion"
 }
 
 repositories {
     mavenLocal()
+    maven { url "https://maven.aliyun.com/repository/public" }
+    maven { url "https://maven.aliyun.com/repository/spring" }
+    maven { url "https://maven.aliyun.com/repository/spring-plugin" }
+    maven { url "https://repo.spring.io/libs-release" }
+    maven { url "https://repo.spring.io/milestone" }
     mavenCentral()
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION=3.1.1
+VERSION=3.1.2
 GROUPID=net.dreamlu
 
 NEXUS_OSS_USER_NAME=***

diff --git a/src/main/java/net/dreamlu/mica/auto/common/AbstractMicaProcessor.java b/src/main/java/net/dreamlu/mica/auto/common/AbstractMicaProcessor.java
@@ -97,8 +97,9 @@ protected AnnotationMirror getAnnotation(Elements elementUtils, Element e, Strin
 			}
 			// 处理组合注解
 			Element element = annotation.getAnnotationType().asElement();
-			// 如果是 java 元注解，继续循环
-			if (element.toString().startsWith("java.lang")) {
+			String elementStr = element.toString();
+			// 如果是 java 或 kotlin 元注解，继续循环
+			if (elementStr.startsWith("java.lang") || elementStr.endsWith("kotlin.")) {
 				continue;
 			}
 			// 递归处理 组合注解