Merge pull request #19 from wyjsonGo/develop

publish v2.1.1
修复Gradle生成文档任务存在多个变体失败bug

Author: wyjsonGo

GoRouter-Gradle-Plugin/src/main/kotlin/com/wyjson/router/gradle_plugin/doc/GenerateRouteDocTask.kt

@@ -28,15 +28,14 @@ abstract class GenerateRouteDocTask : DefaultTask() {
     fun taskAction() {
         Logger.i(TAG, "Generate GoRouter document task start.")
         project.dependProject().plus(project).forEach { curProject ->
-            val genFile = curProject.file("${curProject.buildDir}/generated/ap_generated_sources/debug").listFiles()
+            val genFile = curProject.file("${curProject.buildDir}/generated/ap_generated_sources").listFiles()
             val collection = curProject.files(genFile).asFileTree.filter { it.name.endsWith(Constants.DOCUMENT_FILE_NAME) }
             if (collection.isEmpty) {
                 Logger.w(TAG, "project[${curProject.name}] scan 0 route document.")
             } else {
-                for (file in collection) {
-                    Logger.i(TAG, "project[${curProject.name}] found the file[${file.name}].")
-                    mergeRouteModuleDoc(curProject, file)
-                }
+                val file = collection.first()
+                Logger.i(TAG, "project[${curProject.name}] found the file[${file.name}].")
+                mergeRouteModuleDoc(curProject, file)
             }
         }
         if (document == null) {

app/GoRouter-route-doc.json

@@ -81,6 +81,18 @@
         "type": "Activity",
         "pathClass": "com.wyjson.module_main.activity.MainActivity"
       },
+      {
+        "path": "/main/event/activity",
+        "remark": "事件页面",
+        "type": "Activity",
+        "pathClass": "com.wyjson.module_main.activity.EventActivity"
+      },
+      {
+        "path": "/main/event/fragment",
+        "remark": "事件片段",
+        "type": "Fragment",
+        "pathClass": "com.wyjson.module_main.fragment.EventFragment"
+      },
       {
         "path": "/main/splash/activity",
         "remark": "欢迎页",

app/build.gradle

@@ -1,11 +1,11 @@
 plugins {
     id 'com.android.application'
-    id 'com.wyjson.gorouter'
-}
-GoRouter {
-    // 允许执行自动注册任务的集合，最好不要写debug,以节省开发阶段build时间。
-    buildTypes "release"
+//    id 'com.wyjson.gorouter'
 }
+//GoRouter {
+//    // 允许执行自动注册任务的集合，最好不要写debug,以节省开发阶段build时间。
+//    buildTypes "release"
+//}
 android {
     namespace 'com.wyjson.go_router'
     compileSdk 33

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     dependencies {
-        classpath "com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:${VERSION}"
+//        classpath "com.github.wyjsonGo.GoRouter:GoRouter-Gradle-Plugin:${VERSION}"
     }
 }
 

gradle.properties

@@ -25,4 +25,4 @@ android.nonTransitiveRClass=true
 # org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
 
 GROUP_ID=com.github.wyjsonGo.GoRouter
-VERSION=2.1.0
+VERSION=2.1.1

module_common/build.gradle

@@ -36,9 +36,9 @@ android {
 dependencies {
     api 'androidx.appcompat:appcompat:1.6.1'
 
-//    api project(path: ':GoRouter-Api')
-//    annotationProcessor project(path: ':GoRouter-Compiler')
+    api project(path: ':GoRouter-Api')
+    annotationProcessor project(path: ':GoRouter-Compiler')
 
-    api "com.github.wyjsonGo.GoRouter:GoRouter-Api:${VERSION}"
-    annotationProcessor "com.github.wyjsonGo.GoRouter:GoRouter-Compiler:${VERSION}"
+//    api "com.github.wyjsonGo.GoRouter:GoRouter-Api:${VERSION}"
+//    annotationProcessor "com.github.wyjsonGo.GoRouter:GoRouter-Compiler:${VERSION}"
 }

module_main/build.gradle

@@ -38,6 +38,6 @@ android {
 
 dependencies {
     api project(path: ':module_common')
-//    annotationProcessor project(path: ':GoRouter-Compiler')
-    annotationProcessor "com.github.wyjsonGo.GoRouter:GoRouter-Compiler:${VERSION}"
+    annotationProcessor project(path: ':GoRouter-Compiler')
+//    annotationProcessor "com.github.wyjsonGo.GoRouter:GoRouter-Compiler:${VERSION}"
 }

module_user/build.gradle

@@ -38,6 +38,6 @@ android {
 
 dependencies {
     api project(path: ':module_common')
-//    annotationProcessor project(path: ':GoRouter-Compiler')
-    annotationProcessor "com.github.wyjsonGo.GoRouter:GoRouter-Compiler:${VERSION}"
+    annotationProcessor project(path: ':GoRouter-Compiler')
+//    annotationProcessor "com.github.wyjsonGo.GoRouter:GoRouter-Compiler:${VERSION}"
 }