minor fixes and improvements

Author: alexeytereshchenko

plugin/build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'io.github.alexeytereshchenko.guardian'
-version = '1.2.1'
+version = '1.2.2'
 
 dependencies {
     implementation 'net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.0.1'

plugin/src/main/java/io/github/alexeytereshchenko/guardian/GuardianPlugin.java

@@ -4,10 +4,14 @@
 import io.github.alexeytereshchenko.guardian.extention.GuardianCheckStyleExtension;
 import io.github.alexeytereshchenko.guardian.extention.GuardianExtension;
 import io.github.alexeytereshchenko.guardian.meta.TaskName;
+import io.github.alexeytereshchenko.guardian.task.DownloadCheckstyleFile;
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+import java.util.Set;
 import net.ltgt.gradle.errorprone.CheckSeverity;
 import net.ltgt.gradle.errorprone.ErrorProneCompilerArgumentProvider;
 import net.ltgt.gradle.errorprone.ErrorProneOptions;
-
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
@@ -22,13 +26,6 @@
 import org.gradle.language.base.internal.plugins.CleanRule;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
-import java.net.URL;
-import java.util.List;
-import java.util.Set;
-
-import io.github.alexeytereshchenko.guardian.task.DownloadCheckstyleFile;
-
 public class GuardianPlugin implements Plugin<Project> {
   @Override
   public void apply(@NotNull Project project) {
@@ -40,9 +37,13 @@ public void apply(@NotNull Project project) {
 
       configurePlugins(evaluatedProject);
       configureDependencies(evaluatedProject, guardianExtension);
-      configureErrorProne(evaluatedProject, guardianExtension);
       configureGitHooks(evaluatedProject, guardianExtension);
 
+      boolean enableErrorProne = guardianExtension.getErrorProne().isEnable();
+      if (enableErrorProne) {
+        configureErrorProne(evaluatedProject, guardianExtension);
+      }
+
       boolean enableChecker = guardianExtension.getCheckStyle().isEnable();
       if (enableChecker) {
         project.getPlugins().apply("checkstyle");
@@ -94,7 +95,11 @@ private void configureDownloadConfigFileTask(Project project, GuardianExtension
     });
   }
 
-  private void configureDownloadConfigFileProperties(DownloadCheckstyleFile task, GuardianExtension guardianExtension, String filePath) {
+  private void configureDownloadConfigFileProperties(
+      DownloadCheckstyleFile task,
+      GuardianExtension guardianExtension,
+      String filePath
+  ) {
     GuardianCheckStyleExtension checkStyleExtension = guardianExtension.getCheckStyle();
     String checkstyleFileUrl = checkStyleExtension.getFileUrl();
 
@@ -170,7 +175,7 @@ private String getGuardianCheckStyleFilePath(Project project) {
   }
 
   private String getCustomCheckStyleFilePath(Project project) {
-    return project.getProjectDir().getPath() + "/config/checkstyle/checkstyle.xml";
+    return project.getRootProject().getRootDir().getAbsolutePath() + "/config/checkstyle/checkstyle.xml";
   }
 
   private void configureErrorProne(Project project, GuardianExtension guardianExtension) {
@@ -188,12 +193,13 @@ private void configureErrorProne(Project project, GuardianExtension guardianExte
     });
   }
 
-  private void configureErrorProneOptions(ErrorProneOptions options,
-                                          GuardianExtension guardianExtension) {
+  private void configureErrorProneOptions(
+      ErrorProneOptions options,
+      GuardianExtension guardianExtension
+  ) {
     ErrorProneExtension errorProne = guardianExtension.getErrorProne();
-    boolean enableErrorProne = errorProne.isEnable();
 
-    options.getEnabled().convention(enableErrorProne);
+    options.getEnabled().convention(true);
     options.getDisableAllWarnings().convention(true);
     options.getDisableWarningsInGeneratedCode().convention(true);
     options.getExcludedPaths().convention(".*/build/generated/.*");

plugin/src/main/java/io/github/alexeytereshchenko/guardian/extention/ErrorProneExtension.java

@@ -5,7 +5,7 @@
 
 public class ErrorProneExtension {
   private boolean enable = true;
-  private String dependency = "com.google.errorprone:error_prone_core:2.23.0";
+  private String dependency = "com.google.errorprone:error_prone_core:2.24.1";
   private String dependencyJavac = "com.google.errorprone:javac:9+181-r4173-1";
 
   private Set<String> bugPatterns = new HashSet<>();