collect maven custom lint rules

grab · May 9, 2024 · 7aabfdd · 7aabfdd
1 parent d4df4ac
commit 7aabfdd
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 23 deletions.
diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/variant/AndroidVariants.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/variant/AndroidVariants.kt
@@ -10,6 +10,7 @@ import com.grab.grazel.gradle.variant.Classpath.Runtime
 import com.grab.grazel.gradle.variant.VariantType.AndroidBuild
 import com.grab.grazel.gradle.variant.VariantType.AndroidTest
 import com.grab.grazel.gradle.variant.VariantType.JvmBuild
+import com.grab.grazel.gradle.variant.VariantType.Lint
 import com.grab.grazel.gradle.variant.VariantType.Test
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
@@ -94,6 +95,7 @@ abstract class AndroidNonVariant<T>(
         get() = backingVariant.name + when (variantType) {
             AndroidTest -> AndroidTest.name
             Test -> Test.name
+            Lint -> Lint.name
             else -> ""
         }
 
@@ -200,6 +202,7 @@ data class DefaultVariantData(
     val name: String = when (variantType) {
         AndroidBuild -> DEFAULT_VARIANT
         AndroidTest -> ANDROID_TEST_VARIANT
+        Lint -> LINT_VARIANT
         else -> TEST_VARIANT
     },
 )
@@ -241,6 +244,7 @@ class AndroidDefaultVariant(
                     AndroidBuild -> !configName.isTest()
                     AndroidTest -> configName.isAndroidTest()
                     Test -> configName.isUnitTest()
+                    Lint -> configName.isLint()
                     JvmBuild -> error("Invalid variant type ${JvmBuild.name} for Android variant")
                 }
             }.toSet()

diff --git a/...adle-plugin/src/main/kotlin/com/grab/grazel/gradle/variant/ConfigurationParsingVariant.kt b/...adle-plugin/src/main/kotlin/com/grab/grazel/gradle/variant/ConfigurationParsingVariant.kt
@@ -4,6 +4,7 @@ import com.grab.grazel.gradle.hasKapt
 import com.grab.grazel.gradle.variant.VariantType.AndroidBuild
 import com.grab.grazel.gradle.variant.VariantType.AndroidTest
 import com.grab.grazel.gradle.variant.VariantType.JvmBuild
+import com.grab.grazel.gradle.variant.VariantType.Lint
 import com.grab.grazel.gradle.variant.VariantType.Test
 import com.grab.grazel.util.addTo
 import org.gradle.api.artifacts.Configuration
@@ -78,6 +79,7 @@ interface ConfigurationParsingVariant<T> : Variant<T> {
                     AndroidBuild -> configName.startsWith("kapt${namePattern.capitalize()}")
                     AndroidTest -> configName.startsWith("kaptAndroidTest${basePattern.capitalize()}")
                     Test -> configName.startsWith("kaptTest${basePattern.capitalize()}")
+                    VariantType.Lint -> false
                     JvmBuild -> error("Invalid variant type ${JvmBuild.name} for Android variant")
                 }
             }.addTo(this)
@@ -106,6 +108,8 @@ interface ConfigurationParsingVariant<T> : Variant<T> {
                 Test -> configName == "test${basePattern}${onlyConfig}$dm".toLowerCase()
                     || configName == "test${basePattern}Implementation$dm".toLowerCase()
 
+                Lint -> configName == "lintChecks".toLowerCase()
+
                 else -> error("$JvmBuild invalid for build type runtime configuration")
             }
         }.toSet()
@@ -118,5 +122,7 @@ interface ConfigurationParsingVariant<T> : Variant<T> {
         || startsWith("kaptTest")
         || contains("UnitTest")
 
+    fun String.isLint() = startsWith("lintChecks")
+
     fun String.isTest() = isAndroidTest() || isUnitTest() || contains("Test")
 }
diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/variant/Variant.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/variant/Variant.kt
@@ -15,6 +15,7 @@ import com.grab.grazel.gradle.isAndroid
 import com.grab.grazel.gradle.variant.VariantType.AndroidBuild
 import com.grab.grazel.gradle.variant.VariantType.AndroidTest
 import com.grab.grazel.gradle.variant.VariantType.JvmBuild
+import com.grab.grazel.gradle.variant.VariantType.Lint
 import com.grab.grazel.gradle.variant.VariantType.Test
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
@@ -66,18 +67,23 @@ enum class DefaultVariants(val variantName: String) {
     },
     AndroidTest("androidTest") {
         override fun toString() = variantName
+    },
+    Lint("lint") {
+        override fun toString() = variantName
     }
 }
 
 val DEFAULT_VARIANT = DefaultVariants.Default.toString()
 val TEST_VARIANT = DefaultVariants.Test.toString()
 val ANDROID_TEST_VARIANT = DefaultVariants.AndroidTest.toString()
+val LINT_VARIANT = DefaultVariants.Lint.toString()
 
 enum class VariantType {
     AndroidBuild,
     AndroidTest,
     Test,
     JvmBuild,
+    Lint,
 }
 
 fun BaseVariant.toVariantType(): VariantType = when (this) {
@@ -134,6 +140,7 @@ class JvmVariantData(
     val variantType: VariantType,
     val name: String = when (variantType) {
         JvmBuild -> DEFAULT_VARIANT
+        Lint -> LINT_VARIANT
         else -> TEST_VARIANT
     }
 )

diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/variant/VariantBuilder.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/gradle/variant/VariantBuilder.kt
@@ -5,6 +5,7 @@ import com.grab.grazel.gradle.isJvm
 import com.grab.grazel.gradle.variant.VariantType.AndroidBuild
 import com.grab.grazel.gradle.variant.VariantType.AndroidTest
 import com.grab.grazel.gradle.variant.VariantType.JvmBuild
+import com.grab.grazel.gradle.variant.VariantType.Lint
 import com.grab.grazel.gradle.variant.VariantType.Test
 import org.gradle.api.Project
 import java.util.concurrent.ConcurrentHashMap
@@ -66,6 +67,11 @@ constructor(
                         project = project,
                         variantType = AndroidTest,
                         ignoreKeywords = flavorsBuildTypes
+                    ),
+                    AndroidDefaultVariant(
+                        project = project,
+                        variantType = VariantType.Lint,
+                        ignoreKeywords = flavorsBuildTypes
                     )
                 )
 
@@ -139,6 +145,13 @@ constructor(
                         ignoreKeywords = flavorsBuildTypes
                     )
                 )
+                action(
+                    AndroidDefaultVariant(
+                        project = project,
+                        variantType = Lint,
+                        ignoreKeywords = flavorsBuildTypes
+                    )
+                )
 
                 variantDataSource.migratableVariants(project) { variant ->
                     action(AndroidVariant(project, variant))
@@ -153,7 +166,7 @@ constructor(
                         .asSequence()
                         .flatMap { buildType ->
                             VariantType.values()
-                                .filter { it != JvmBuild }
+                                .filter { it != JvmBuild && it != Lint }
                                 .map { variantType ->
                                     AndroidBuildType(
                                         project = project,
@@ -168,7 +181,7 @@ constructor(
                     VariantType
                         .values()
                         .asSequence()
-                        .filter { it != JvmBuild }
+                        .filter { it != JvmBuild && it != Lint }
                         .flatMap { variantType ->
                             flavors.map { flavor ->
                                 AndroidFlavor(
@@ -183,6 +196,7 @@ constructor(
             } else if (project.isJvm) {
                 action(JvmVariant(project = project, variantType = JvmBuild))
                 action(JvmVariant(project = project, variantType = Test))
+                action(JvmVariant(project = project, variantType = Lint))
             }
         }
     }

diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/LintConfigData.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/LintConfigData.kt
@@ -27,6 +27,18 @@ data class LintConfigData(
     val baselinePath: String? = null,
     val lintChecks: List<BazelDependency>? = null
 ) {
+
+    private fun lintChecksString(): String? {
+        if (lintChecks.isNullOrEmpty()) return null
+        return "[" + lintChecks.joinToString(",") {
+            if (it is BazelDependency.StringDependency) {
+                "\"//$it\""
+            } else {
+                "\"${it}\""
+            }
+        } + "]"
+    }
+
     val merged: List<StarlarkMapEntry> = listOf(
         StarlarkMapEntry(
             name = "enabled",
@@ -47,14 +59,7 @@ data class LintConfigData(
             quoteValues = true
         ),
         StarlarkMapEntry(
-            name = "lint_checks",
-            value = if (lintChecks != null) {
-                "[${lintChecks.joinToString(",", transform = BazelDependency::quote)}]"
-            } else {
-                null
-            },
-            quoteKeys = true,
-            quoteValues = false
+            name = "lint_checks", value = lintChecksString(), quoteKeys = true, quoteValues = false
         )
     ).filter { it.value != null }
 }
diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/LintExtractor.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/LintExtractor.kt
@@ -24,16 +24,18 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.kotlin.dsl.the
 
-internal fun Project.customLintRulesTargets(): List<BazelDependency>? {
-    return configurations
-        .asSequence()
-        .filter { it.name.contains("lintChecks") }
+fun Project.customLintRulesTargets(): List<BazelDependency>? {
+    return configurations.asSequence().filter { it.name.contains("lintChecks") }
         .flatMap { lintChecksConfig ->
             lintChecksConfig
                 .dependencies
                 .asSequence()
-                .filterIsInstance<ProjectDependency>()
-                .map { BazelDependency.ProjectDependency(it.dependencyProject) }
+                .map {
+                    if (it is ProjectDependency) {
+                        BazelDependency.ProjectDependency(it.dependencyProject)
+                    } else {
+                        BazelDependency.MavenDependency(group = it.group!!, name = it.name, repo = "lint_maven")
+                    } }
         }.let { it.toList().ifEmpty { null } }
 }
 

diff --git a/keystore/BUILD.bazel b/keystore/BUILD.bazel
@@ -1,9 +1,10 @@
 filegroup(
-    name = "debug-keystore",
-    srcs = [
-        "debug.keystore",
-    ],
-    visibility = [
-        "//visibility:public",
-    ],
+  name = "debug-keystore",
+  srcs = [
+    "debug.keystore",
+  ],
+  visibility = [
+    "//visibility:public",
+  ]
 )
+
diff --git a/sample-android-library/BUILD.bazel b/sample-android-library/BUILD.bazel
@@ -12,6 +12,10 @@ android_library(
         "config": "//:lint.xml",
     },
     manifest = "src/main/AndroidManifest.xml",
+    resources = {
+        "src/main/res": {
+        },
+    },
     visibility = [
         "//visibility:public",
     ],
@@ -32,6 +36,10 @@ android_library(
         "config": "//:lint.xml",
     },
     manifest = "src/main/AndroidManifest.xml",
+    resources = {
+        "src/main/res": {
+        },
+    },
     visibility = [
         "//visibility:public",
     ],
@@ -52,6 +60,10 @@ android_library(
         "config": "//:lint.xml",
     },
     manifest = "src/main/AndroidManifest.xml",
+    resources = {
+        "src/main/res": {
+        },
+    },
     visibility = [
         "//visibility:public",
     ],
@@ -72,6 +84,10 @@ android_library(
         "config": "//:lint.xml",
     },
     manifest = "src/main/AndroidManifest.xml",
+    resources = {
+        "src/main/res": {
+        },
+    },
     visibility = [
         "//visibility:public",
     ],