From 1752b3100b8ce33dd7879c0134456ec22e78e896 Mon Sep 17 00:00:00 2001
From: Ben Trengrove <bentrengrove@google.com>
Date: Tue, 26 Nov 2024 17:10:58 +1100
Subject: [PATCH] Only apply lint to published libraries

---
 adaptive/build.gradle.kts                                      | 1 -
 .../src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt | 3 +++
 drawablepainter/build.gradle.kts                               | 1 -
 internal-testutils/build.gradle.kts                            | 1 -
 navigation-animation/build.gradle.kts                          | 1 -
 navigation-material/build.gradle.kts                           | 1 -
 permissions/build.gradle.kts                                   | 1 -
 systemuicontroller/build.gradle.kts                            | 1 -
 testharness/build.gradle.kts                                   | 1 -
 9 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/adaptive/build.gradle.kts b/adaptive/build.gradle.kts
index b518ff815..dea7f0f57 100644
--- a/adaptive/build.gradle.kts
+++ b/adaptive/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
index a9d1cbce3..706d0731b 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryPublishedConventionPlugin.kt
@@ -1,6 +1,7 @@
 import me.tylerbwong.gradle.metalava.extension.MetalavaExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 
 /*
@@ -23,6 +24,8 @@ class AndroidLibraryPublishedConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
+                apply(AndroidLintConventionPlugin::class)
+
                 apply("me.tylerbwong.gradle.metalava")
                 apply("org.jetbrains.dokka")
                 apply("com.vanniktech.maven.publish")
diff --git a/drawablepainter/build.gradle.kts b/drawablepainter/build.gradle.kts
index 1896a72c3..ad11480c5 100644
--- a/drawablepainter/build.gradle.kts
+++ b/drawablepainter/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/internal-testutils/build.gradle.kts b/internal-testutils/build.gradle.kts
index 7d1f4526b..af02046fc 100644
--- a/internal-testutils/build.gradle.kts
+++ b/internal-testutils/build.gradle.kts
@@ -18,7 +18,6 @@
 plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/navigation-animation/build.gradle.kts b/navigation-animation/build.gradle.kts
index f63e085ae..d312fc4f3 100644
--- a/navigation-animation/build.gradle.kts
+++ b/navigation-animation/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/navigation-material/build.gradle.kts b/navigation-material/build.gradle.kts
index f73727fc2..b24487f1e 100644
--- a/navigation-material/build.gradle.kts
+++ b/navigation-material/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/permissions/build.gradle.kts b/permissions/build.gradle.kts
index 4d34446e4..c891301cf 100644
--- a/permissions/build.gradle.kts
+++ b/permissions/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/systemuicontroller/build.gradle.kts b/systemuicontroller/build.gradle.kts
index 252b8f877..1c0b4717d 100644
--- a/systemuicontroller/build.gradle.kts
+++ b/systemuicontroller/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {
diff --git a/testharness/build.gradle.kts b/testharness/build.gradle.kts
index 1c0d45315..a2076502d 100644
--- a/testharness/build.gradle.kts
+++ b/testharness/build.gradle.kts
@@ -19,7 +19,6 @@ plugins {
     alias(libs.plugins.accompanist.android.library)
     alias(libs.plugins.accompanist.android.library.compose)
     alias(libs.plugins.accompanist.android.library.published)
-    alias(libs.plugins.accompanist.android.lint)
 }
 
 android {