Fix #7 by finding source from all android extension which subclass Ba…

…seExtension (#8) * Fix #7 by finding source from all android extension which subclass BaseExtension This should get not only Android App but also Android Library, InstantApp, etc. * update readme
jeremymailen · Jun 8, 2017 · 709daeb · 709daeb
1 parent 3da7400
commit 709daeb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Available on the Gradle Plugins Portal: https://plugins.gradle.org/plugin/org.jm
 
 ```groovy
 plugins {
-    id 'org.jmailen.kotlinter' version '0.9.2'
+    id 'org.jmailen.kotlinter' version '0.9.3'
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 }
 
 
-version = '0.9.2'
+version = '0.9.3'
 group = 'org.jmailen.gradle'
 def pluginId = 'org.jmailen.kotlinter'
 

diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/KotlinterPlugin.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/KotlinterPlugin.kt
@@ -1,6 +1,7 @@
 package org.jmailen.gradle.kotlinter
 
 import com.android.build.gradle.AppExtension
+import com.android.build.gradle.BaseExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.file.FileCollection
@@ -45,7 +46,7 @@ class KotlinterPlugin : Plugin<Project> {
 
     private fun androidSourceSets(project: Project): List<SourceSetInfo> {
         val android = project.extensions.findByName("android")
-        val sourceSetInfos = (android as? AppExtension)?.let {
+        val sourceSetInfos = (android as? BaseExtension)?.let {
             it.sourceSets.map { androidSourceSet ->
 
                 val kotlinSourceTree = androidSourceSet.java.srcDirs.map { dir ->

diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/LintTask.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/LintTask.kt
@@ -29,13 +29,13 @@ open class LintTask : SourceTask() {
         getSource().forEach { file ->
             val relativePath = file.toRelativeString(project.projectDir)
 
-            logger.log(LogLevel.DEBUG, "linting: $relativePath")
+            logger.log(LogLevel.DEBUG, "$name linting: $relativePath")
 
             val lintFunc = when (file.extension) {
                 "kt" -> this::lintKt
                 "kts" -> this::lintKts
                 else -> {
-                    logger.log(LogLevel.DEBUG, "ignoring non Kotlin file: $relativePath")
+                    logger.log(LogLevel.DEBUG, "$name ignoring non Kotlin file: $relativePath")
                     null
                 }
             }