Merge pull request #12 from wyjsonGo/develop

wyjsonGo · web-flow · commit 72d3df061026 · 2023-11-01T17:57:12.000+08:00
publish v1.1.3
1.支持父类字段自动注入
2.优化文档字段类型
diff --git a/GoRouter-Compiler/build.gradle b/GoRouter-Compiler/build.gradle
@@ -18,7 +18,7 @@ dependencies {
 
     implementation 'com.google.code.gson:gson:2.10.1'
 
-    implementation project(path: ':GoRouter-Annotation')
-//    implementation 'com.github.wyjsonGo.GoRouter:GoRouter-Annotation:1.1.3'
+//    implementation project(path: ':GoRouter-Annotation')
+    implementation 'com.github.wyjsonGo.GoRouter:GoRouter-Annotation:1.1.3'
 
 }
diff --git a/GoRouter/build.gradle b/GoRouter/build.gradle
@@ -25,6 +25,6 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    api project(path: ':GoRouter-Annotation')
-//    api 'com.github.wyjsonGo.GoRouter:GoRouter-Annotation:1.1.3'
+//    api project(path: ':GoRouter-Annotation')
+    api 'com.github.wyjsonGo.GoRouter:GoRouter-Annotation:1.1.3'
 }
diff --git a/module_common/build.gradle b/module_common/build.gradle
@@ -38,9 +38,9 @@ android {
 dependencies {
     api 'androidx.appcompat:appcompat:1.6.1'
 
-    api project(path: ':GoRouter')
-    annotationProcessor project(path: ':GoRouter-Compiler')
+//    api project(path: ':GoRouter')
+//    annotationProcessor project(path: ':GoRouter-Compiler')
 
-//    api 'com.github.wyjsonGo.GoRouter:GoRouter:1.1.3'
-//    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:1.1.3'
+    api 'com.github.wyjsonGo.GoRouter:GoRouter:1.1.3'
+    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:1.1.3'
 }
diff --git a/module_main/build.gradle b/module_main/build.gradle
@@ -40,6 +40,6 @@ android {
 
 dependencies {
     api project(path: ':module_common')
-    annotationProcessor project(path: ':GoRouter-Compiler')
-//    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:1.1.3'
+//    annotationProcessor project(path: ':GoRouter-Compiler')
+    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:1.1.3'
 }
diff --git a/module_user/build.gradle b/module_user/build.gradle
@@ -40,6 +40,6 @@ android {
 
 dependencies {
     api project(path: ':module_common')
-    annotationProcessor project(path: ':GoRouter-Compiler')
-//    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:1.1.3'
+//    annotationProcessor project(path: ':GoRouter-Compiler')
+    annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:1.1.3'
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ dependencies {`
`18`	`18`
`19`	`19`	`implementation 'com.google.code.gson:gson:2.10.1'`
`20`	`20`
`21`		`- implementation project(path: ':GoRouter-Annotation')`
`22`		`-// implementation 'com.github.wyjsonGo.GoRouter:GoRouter-Annotation:1.1.3'`
	`21`	`+// implementation project(path: ':GoRouter-Annotation')`
	`22`	`+ implementation 'com.github.wyjsonGo.GoRouter:GoRouter-Annotation:1.1.3'`
`23`	`23`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ android {`
`25`	`25`
`26`	`26`	`dependencies {`
`27`	`27`	`implementation 'androidx.appcompat:appcompat:1.6.1'`
`28`		`- api project(path: ':GoRouter-Annotation')`
`29`		`-// api 'com.github.wyjsonGo.GoRouter:GoRouter-Annotation:1.1.3'`
	`28`	`+// api project(path: ':GoRouter-Annotation')`
	`29`	`+ api 'com.github.wyjsonGo.GoRouter:GoRouter-Annotation:1.1.3'`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ android {`
`40`	`40`
`41`	`41`	`dependencies {`
`42`	`42`	`api project(path: ':module_common')`
`43`		`- annotationProcessor project(path: ':GoRouter-Compiler')`
`44`		`-// annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:1.1.3'`
	`43`	`+// annotationProcessor project(path: ':GoRouter-Compiler')`
	`44`	`+ annotationProcessor 'com.github.wyjsonGo.GoRouter:GoRouter-Compiler:1.1.3'`
`45`	`45`	`}`