Updated all default tool versions and fixed Android kotlin checks not executing issue

btkelly · btkelly · commit 9b74b6d0c801 · 2022-07-28T14:51:28.000-04:00
diff --git a/example-android-kts/app/build.gradle.kts b/example-android-kts/app/build.gradle.kts
@@ -25,10 +25,6 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
     }
-
-    sourceSets {
-        getByName("main").java.srcDirs("src/main/kotlin")
-    }
 }
 
 dependencies {
diff --git a/example-android/app/build.gradle b/example-android/app/build.gradle
@@ -33,10 +33,6 @@ android {
         }
     }
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
     lintOptions {
         abortOnError false
     }
diff --git a/plugin/src/main/groovy/com/btkelly/gnag/tasks/GnagCheckTask.java b/plugin/src/main/groovy/com/btkelly/gnag/tasks/GnagCheckTask.java
@@ -51,10 +51,10 @@
  */
 public class GnagCheckTask extends DefaultTask {
 
-  public static final String KTLINT_TOOL_VERSION = "0.42.0";
-  public static final String DETEKT_TOOL_VERSION = "1.17.1";
-  public static final String PMD_TOOL_VERSION = "6.22.0";
-  public static final String CHECKSTYLE_TOOL_VERSION = "8.45.1";
+  public static final String KTLINT_TOOL_VERSION = "0.46.1";
+  public static final String DETEKT_TOOL_VERSION = "1.21.0";
+  public static final String PMD_TOOL_VERSION = "6.47.0";
+  public static final String CHECKSTYLE_TOOL_VERSION = "10.3.1";
 
   static final String TASK_NAME = "gnagCheck";
   private final ProjectHelper projectHelper = new ProjectHelper(getProject());
diff --git a/plugin/src/main/groovy/com/btkelly/gnag/utils/ProjectHelper.groovy b/plugin/src/main/groovy/com/btkelly/gnag/utils/ProjectHelper.groovy
@@ -78,6 +78,11 @@ class ProjectHelper {
                         files = files + FileUtils.listFiles(javaSrcDir, suffices, true)
                     }
                 }
+                sourceSet.kotlin.srcDirs.each { File kotlinSrcDir ->
+                    if (kotlinSrcDir.exists()) {
+                        files = files + FileUtils.listFiles(kotlinSrcDir, suffices, true)
+                    }
+                }
 
                 files
             }
diff --git a/version.gradle b/version.gradle
@@ -1,4 +1,4 @@
-project.ext.gnagPluginVersion = '3.0.2'
+project.ext.gnagPluginVersion = '3.0.3'
 project.ext.gnagPackageId = 'com.btkelly.gnag'
 project.ext.gnagArtifactId = 'gnag'
 project.ext.gnagPluginName = 'gnag-gradle-plugin'

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,6 @@ android {`
`25`	`25`	`proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")`
`26`	`26`	`}`
`27`	`27`	`}`
`28`		`-`
`29`		`- sourceSets {`
`30`		`- getByName("main").java.srcDirs("src/main/kotlin")`
`31`		`- }`
`32`	`28`	`}`
`33`	`29`
`34`	`30`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,6 @@ android {`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- sourceSets {`
`37`		`- main.java.srcDirs += 'src/main/kotlin'`
`38`		`- }`
`39`		`-`
`40`	`36`	`lintOptions {`
`41`	`37`	`abortOnError false`
`42`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,11 @@ class ProjectHelper {`
`78`	`78`	`files = files + FileUtils.listFiles(javaSrcDir, suffices, true)`
`79`	`79`	`}`
`80`	`80`	`}`
	`81`	`+ sourceSet.kotlin.srcDirs.each { File kotlinSrcDir ->`
	`82`	`+ if (kotlinSrcDir.exists()) {`
	`83`	`+ files = files + FileUtils.listFiles(kotlinSrcDir, suffices, true)`
	`84`	`+ }`
	`85`	`+ }`
`81`	`86`
`82`	`87`	`files`
`83`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-project.ext.gnagPluginVersion = '3.0.2'`
	`1`	`+project.ext.gnagPluginVersion = '3.0.3'`
`2`	`2`	`project.ext.gnagPackageId = 'com.btkelly.gnag'`
`3`	`3`	`project.ext.gnagArtifactId = 'gnag'`
`4`	`4`	`project.ext.gnagPluginName = 'gnag-gradle-plugin'`