release 2.6.9

TongchengOpenSource · May 16, 2023 · ce17bbd · ce17bbd
1 parent f7ed654
commit ce17bbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ plugins {
 }
 
 group 'com.github.shalousun'
-version '2.6.8'
+version '2.6.9'
 
 sourceCompatibility = 1.8
 
@@ -29,7 +29,7 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'com.github.shalousun', name: 'smart-doc', version: '2.6.8'
+    implementation group: 'com.github.shalousun', name: 'smart-doc', version: '2.6.9'
 }
 tasks.withType(JavaCompile) {
     options.encoding = "UTF-8"

diff --git a/src/main/java/com/smartdoc/gradle/task/DocBaseTask.java b/src/main/java/com/smartdoc/gradle/task/DocBaseTask.java
@@ -125,7 +125,7 @@ public void action() {
     /**
      * Classloading
      *
-     * @return
+     * @return  JavaProjectBuilder
      */
     private JavaProjectBuilder buildJavaProjectBuilder(Project project, Set<String> excludes, Set<String> includes) {
 //        JavaProjectBuilder javaDocBuilder = new JavaProjectBuilder();
@@ -146,7 +146,7 @@ private JavaProjectBuilder buildJavaProjectBuilder(Project project, Set<String>
                 getLogger().quiet(MSG + src);
                 javaDocBuilder.addSourceTree(src);
             });
-        //sources.stream().map(File::new).forEach(javaDocBuilder::addSourceTree);
+//        sources.stream().map(File::new).forEach(javaDocBuilder::addSourceTree);
 //        javaDocBuilder.addClassLoader(ClassLoaderUtil.getRuntimeClassLoader(project));
         loadSourcesDependencies(javaDocBuilder, project, excludes, includes);
         return javaDocBuilder;
@@ -172,15 +172,15 @@ private void loadSourcesDependencies(JavaProjectBuilder javaDocBuilder, Project
                         .setArtifactId(version.getId().getName())
                         .setVersion(version.getId().getVersion());
                 // add local source
-                String artifactName = moduleArtifact.getGroup() + ":" + moduleArtifact.getArtifactId();
+                String artifactName = moduleArtifact.getGroupId() + ":" + moduleArtifact.getArtifactId();
                 addModuleSourceTree(javaDocBuilder, allModules, artifactName);
 
             }
             CustomArtifact artifact = selfModule ? moduleArtifact : CustomArtifact.builder(displayName);
             if (ArtifactFilterUtil.ignoreArtifact(artifact) || ArtifactFilterUtil.ignoreSpringBootArtifactById(artifact)) {
                 continue;
             }
-            String artifactName = artifact.getGroup() + ":" + artifact.getArtifactId();
+            String artifactName = artifact.getGroupId() + ":" + artifact.getArtifactId();
             if (RegexUtil.isMatches(excludes, artifactName)) {
                 continue;
             }