Merge branch '2.x'

# Conflicts: # README.md # README_EN.md # deploy.sh
lets-mica · Oct 14, 2023 · 1c25783 · 1c25783
2 parents bb2b5a9 + 7930e8c
commit 1c25783
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@
 | version | spring boot version | java version |
 |---------|---------------------|--------------|
 | 3.1.1   | 3.x                 | 17           |
-| 2.3.2   | 1.x ~ 3.x           | 1.8          |
+| 2.3.3   | 1.x ~ 3.x           | 1.8          |
 
 ## 原理
 
@@ -63,19 +63,19 @@ mica auto 采用 Annotation Processor，她不是什么新技术，在 jdk 1.6
 <dependency>
   <groupId>net.dreamlu</groupId>
   <artifactId>mica-auto</artifactId>
-  <version>${version}</version>
+  <version>${mica-auto.version}</version>
   <scope>provided</scope>
 </dependency>
 ```
 
 ### gradle >= 5.x
 ```groovy
-annotationProcessor("net.dreamlu:mica-auto:${version}")
+annotationProcessor("net.dreamlu:mica-auto:$micaAutoVersion}")
 ```
 
 ### gradle < 5.x
 ```groovy
-compileOnly "net.dreamlu:mica-auto:${version}"
+compileOnly "net.dreamlu:mica-auto:$micaAutoVersion"
 ```
 
 ## 原理

diff --git a/README_EN.md b/README_EN.md
@@ -14,7 +14,7 @@ English | [简体中文](README.md)
 | version | spring boot version | java version |
 |---------|---------------------|--------------|
 | 3.1.1   | 3.x                 | 17           |
-| 2.3.2   | 1.x ~ 3.x           | 1.8          |
+| 2.3.3   | 1.x ~ 3.x           | 1.8          |
 
 ## Principle
 Mica Auto uses the Annotation Processor, which is not a new technology. It's been around since JDK 1.6. The Annotation Processor is a tool of javac that scans and processes annotations at compile time. Using the Annotation Processor, you can obtain information about annotations and annotated objects, and then automatically generate Java code based on annotations, eliminating manual writing and improving coding efficiency. Lombok is also famous for this technology.
@@ -61,19 +61,19 @@ It is mainly used to avoid the inconsistency between the Spring Boot main projec
 <dependency>
   <groupId>net.dreamlu</groupId>
   <artifactId>mica-auto</artifactId>
-  <version>${version}</version>
+  <version>${mica-auto.version}</version>
   <scope>provided</scope>
 </dependency>
 ```
 
 ### gradle >= 5.x
-```gradle
-annotationProcessor("net.dreamlu:mica-auto:${version}")
+```groovy
+annotationProcessor("net.dreamlu:mica-auto:$micaAutoVersion}")
 ```
 
 ### gradle < 5.x
 ```gradle
-compileOnly "net.dreamlu:mica-auto:${version}"
+compileOnly "net.dreamlu:mica-auto:2.3.2"
 ```
 
 ## Principle