Lint: Support Android Gradle Plugin 9.0.0 (#382)

Author: vanniktech

build.gradle

@@ -77,7 +77,7 @@ dependencies {
   api gradleApi()
   api 'de.aaschmid:gradle-cpd-plugin:3.5'
 
-  compileOnly "com.android.tools.build:gradle:$androidGradlePluginVersion"
+  compileOnly "com.android.tools.build:gradle-api:$androidGradlePluginVersion"
   compileOnly "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
   testImplementation "com.android.tools.build:gradle:$androidGradlePluginVersion"
@@ -102,7 +102,7 @@ kotlin {
   }
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
   testLogging {
     testLogging.exceptionFormat = 'full'
   }

src/main/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPlugin.kt

@@ -1,8 +1,10 @@
 package com.vanniktech.code.quality.tools
 
-import com.android.build.gradle.BaseExtension
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.LibraryExtension
+import com.android.build.api.dsl.Lint
+import com.android.build.api.dsl.TestExtension
 import com.android.build.gradle.LintPlugin
-import com.android.build.gradle.internal.dsl.LintOptions
 import de.aaschmid.gradle.plugins.cpd.Cpd
 import de.aaschmid.gradle.plugins.cpd.CpdExtension
 import de.aaschmid.gradle.plugins.cpd.CpdPlugin
@@ -143,54 +145,56 @@ fun Project.addCheckstyle(rootProject: Project, extension: CodeQualityToolsPlugi
 fun Project.addLint(extension: CodeQualityToolsPluginExtension): Boolean {
   val isNotIgnored = !shouldIgnore(extension)
   val isEnabled = extension.lint.enabled
-  val isAndroidProject = isAndroidProject()
   val isJavaProject = isJavaProject()
 
   if (isNotIgnored && isEnabled) {
-    val lintOptions = if (isAndroidProject) {
-      extensions.getByType(BaseExtension::class.java).lintOptions
-    } else if (isJavaProject && hasLintPlugin()) {
-      plugins.apply(LintPlugin::class.java)
-      extensions.getByType(LintOptions::class.java)
-    } else {
-      null
+    val lintOptions = when {
+      plugins.hasPlugin("com.android.application") -> extensions.getByType(ApplicationExtension::class.java).lint
+      plugins.hasPlugin("com.android.library") -> extensions.getByType(LibraryExtension::class.java).lint
+      plugins.hasPlugin("com.android.test") -> extensions.getByType(TestExtension::class.java).lint
+      isJavaProject && hasLintPlugin() -> {
+        plugins.apply(LintPlugin::class.java)
+        extensions.getByType(Lint::class.java)
+      }
+      else -> {
+        null
+      }
     }
 
     if (lintOptions != null) {
-      lintOptions.isWarningsAsErrors = extension.lint.warningsAsErrors ?: extension.failEarly
-      lintOptions.isAbortOnError = extension.lint.abortOnError ?: extension.failEarly
+      lintOptions.warningsAsErrors = extension.lint.warningsAsErrors ?: extension.failEarly
+      lintOptions.abortOnError = extension.lint.abortOnError ?: extension.failEarly
 
       extension.lint.checkAllWarnings?.let {
-        lintOptions.isCheckAllWarnings = it
+        lintOptions.checkAllWarnings = it
       }
 
       extension.lint.absolutePaths?.let {
-        lintOptions.isAbsolutePaths = it
+        lintOptions.absolutePaths = it
       }
 
       extension.lint.baselineFileName?.let {
-        lintOptions.baselineFile = file(it)
+        lintOptions.baseline = file(it)
       }
 
       extension.lint.lintConfig?.let {
         lintOptions.lintConfig = it
       }
 
       extension.lint.checkReleaseBuilds?.let {
-        lintOptions.isCheckReleaseBuilds = it
+        lintOptions.checkReleaseBuilds = it
       }
 
       extension.lint.checkTestSources?.let {
-        lintOptions.isCheckTestSources = it
+        lintOptions.checkTestSources = it
       }
 
       extension.lint.checkDependencies?.let {
-        lintOptions.isCheckDependencies = it
+        lintOptions.checkDependencies = it
       }
 
       extension.lint.textReport?.let {
         lintOptions.textReport = it
-        lintOptions.textOutput(extension.lint.textOutput)
       }
 
       tasks.named(CHECK_TASK_NAME).configure { it.dependsOn("lint") }
@@ -231,7 +235,6 @@ fun Project.addKtlint(rootProject: Project, extension: CodeQualityToolsPluginExt
       }
 
       configuration.isCanBeConsumed = false
-      configuration.isVisible = false
 
       configuration.defaultDependencies {
         it.add(dependencies.create("com.pinterest.ktlint:ktlint-cli:${extension.ktlint.toolVersion}"))

src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginLintTest.kt

@@ -3,7 +3,6 @@ package com.vanniktech.code.quality.tools
 import org.gradle.api.Project
 import org.junit.Assert.assertEquals
 import org.junit.Test
-import java.io.File
 
 class CodeQualityToolsPluginLintTest : CommonCodeQualityToolsTest() {
   @Test fun empty() {
@@ -36,7 +35,7 @@ class CodeQualityToolsPluginLintTest : CommonCodeQualityToolsTest() {
     assertEquals(true, project.lintOptions.isWarningsAsErrors)
     assertEquals(true, project.lintOptions.isAbortOnError)
     assertEquals(true, project.lintOptions.textReport)
-    assertEquals(File("stdout"), project.lintOptions.textOutput)
+    assertEquals(null, project.lintOptions.textOutput)
     assertEquals(false, project.lintOptions.isCheckAllWarnings)
     assertEquals(null, project.lintOptions.baselineFile)