Implement support for resource_sets API in bazel-common

WORKSPACE

@@ -27,7 +27,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "grab_bazel_common",
-    commit = "e68539fe1df4eff9c613bd78a6003c6dad9a0018",
+    commit = "77f924900d1931ef531131132bdfe4842695a030",
     remote = "https://github.com/grab/grab-bazel-common.git",
 )
 

build.gradle

@@ -93,7 +93,7 @@ grazel {
     rules {
         bazelCommon {
             gitRepository {
-                commit = "e68539fe1df4eff9c613bd78a6003c6dad9a0018"
+                commit = "77f924900d1931ef531131132bdfe4842695a030"
                 remote = "https://github.com/grab/grab-bazel-common.git"
             }
             toolchains {
@@ -169,7 +169,7 @@ idea {
     module {
         excludeDirs += [
             file("bazel-bin"),
-            file("bazel-grazel"),
+            file("bazel-" + projectDir.name),
             file("bazel-cache"),
             file("bazel-out"),
             file("bazel-testlogs"),

flavors/sample-android-flavor/BUILD.bazel

@@ -18,12 +18,17 @@ android_library(
             "generated_value": "generated",
         },
     },
-    resources = {
-        "src/demo/res": {
+    resource_sets = {
+        "demo": {
+            "res": "src/demo/res",
         },
-        "src/free/res": {
+        "free": {
+            "res": "src/free/res",
         },
-        "src/main/res": {
+        "main": {
+            "res": "src/main/res",
+            "assets": "src/main/assets",
+            "manifest": "src/main/AndroidManifest.xml",
         },
     },
     visibility = [
@@ -58,10 +63,14 @@ android_library(
             "generated_value": "generated",
         },
     },
-    resources = {
-        "src/demo/res": {
+    resource_sets = {
+        "demo": {
+            "res": "src/demo/res",
         },
-        "src/main/res": {
+        "main": {
+            "res": "src/main/res",
+            "assets": "src/main/assets",
+            "manifest": "src/main/AndroidManifest.xml",
         },
     },
     visibility = [
@@ -96,12 +105,17 @@ android_library(
             "generated_value": "generated",
         },
     },
-    resources = {
-        "src/full/res": {
+    resource_sets = {
+        "full": {
+            "res": "src/full/res",
         },
-        "src/free/res": {
+        "free": {
+            "res": "src/free/res",
         },
-        "src/main/res": {
+        "main": {
+            "res": "src/main/res",
+            "assets": "src/main/assets",
+            "manifest": "src/main/AndroidManifest.xml",
         },
     },
     visibility = [
@@ -136,10 +150,14 @@ android_library(
             "generated_value": "generated",
         },
     },
-    resources = {
-        "src/full/res": {
+    resource_sets = {
+        "full": {
+            "res": "src/full/res",
         },
-        "src/main/res": {
+        "main": {
+            "res": "src/main/res",
+            "assets": "src/main/assets",
+            "manifest": "src/main/AndroidManifest.xml",
         },
     },
     visibility = [

grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/AndroidRules.kt

@@ -133,7 +133,7 @@ internal fun StatementsBuilder.androidBinary(
     enableCompose: Boolean = false,
     visibility: Visibility = Visibility.Public,
     resourceFiles: List<Assignee> = emptyList(),
-    resources: Assignee? = null,
+    resourceSets: Assignee? = null,
     resValuesData: ResValuesData,
     deps: List<BazelDependency>,
     assetsGlob: List<String> = emptyList(),
@@ -172,7 +172,7 @@ internal fun StatementsBuilder.androidBinary(
         resConfigFilters.notEmpty {
             "resource_configuration_filters" `=` resConfigFilters.quote
         }
-        resources?.let { "resources" `=` resources }
+        resourceSets?.let { "resource_sets" `=` resourceSets }
         deps.notEmpty {
             "deps" `=` array(deps.map(BazelDependency::toString).quote)
         }
@@ -199,7 +199,7 @@ internal fun StatementsBuilder.androidLibrary(
     manifest: String? = null,
     srcsGlob: List<String> = emptyList(),
     visibility: Visibility = Visibility.Public,
-    resources: Assignee? = null,
+    resorceSets: Assignee? = null,
     resourceFiles: List<Assignee> = emptyList(),
     enableDataBinding: Boolean = false,
     enableCompose: Boolean = false,
@@ -226,7 +226,7 @@ internal fun StatementsBuilder.androidLibrary(
                 transform = Assignee::asString
             )
         }
-        resources?.let { "resources" `=` resources }
+        resorceSets?.let { "resource_sets" `=` resorceSets }
         deps.notEmpty {
             "deps" `=` array(deps.map(BazelDependency::toString).map(String::quote))
         }

grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidData.kt

@@ -20,13 +20,18 @@ import com.grab.grazel.bazel.rules.Multidex
 import com.grab.grazel.bazel.starlark.BazelDependency
 import com.grab.grazel.bazel.starlark.LintConfigs
 
+internal data class BazelSourceSet(
+    val name: String,
+    val res: String?,
+    val assets: String?,
+    val manifest: String?,
+)
+
 internal interface AndroidData {
     val name: String
     val srcs: List<String>
-    val res: List<String>
+    val resourceSets: Set<BazelSourceSet>
     val resValuesData: ResValuesData
-    val assets: List<String>
-    val assetsDir: String?
     val manifestFile: String?
 
     // Custom package used for detecting Java/Kotlin sources root
@@ -46,10 +51,8 @@ internal interface AndroidData {
 internal data class AndroidLibraryData(
     override val name: String,
     override val srcs: List<String> = emptyList(),
-    override val res: List<String> = emptyList(),
+    override val resourceSets: Set<BazelSourceSet> = emptySet(),
     override val resValuesData: ResValuesData = ResValuesData(),
-    override val assets: List<String> = emptyList(),
-    override val assetsDir: String? = null,
     override val manifestFile: String? = null,
     override val customPackage: String,
     override val packageName: String,
@@ -65,10 +68,8 @@ internal data class AndroidLibraryData(
 internal data class AndroidBinaryData(
     override val name: String,
     override val srcs: List<String> = emptyList(),
-    override val res: List<String> = emptyList(),
+    override val resourceSets: Set<BazelSourceSet> = emptySet(),
     override val resValuesData: ResValuesData = ResValuesData(),
-    override val assets: List<String> = emptyList(),
-    override val assetsDir: String? = null,
     override val manifestFile: String? = null,
     override val customPackage: String,
     override val packageName: String,

grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidExtractor.kt

@@ -18,11 +18,9 @@ package com.grab.grazel.migrate.android
 
 import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.api.AndroidSourceSet
-import com.android.build.gradle.internal.dsl.LintOptions
 import com.grab.grazel.GrazelExtension
 import com.grab.grazel.bazel.rules.Multidex
 import com.grab.grazel.bazel.starlark.BazelDependency
-import com.grab.grazel.bazel.starlark.LintConfigs
 import com.grab.grazel.gradle.ConfigurationScope.BUILD
 import com.grab.grazel.gradle.dependencies.BuildGraphType
 import com.grab.grazel.gradle.dependencies.DependenciesDataSource
@@ -36,10 +34,7 @@ import com.grab.grazel.gradle.variant.AndroidVariantDataSource
 import com.grab.grazel.gradle.variant.MatchedVariant
 import com.grab.grazel.gradle.variant.getMigratableBuildVariants
 import com.grab.grazel.gradle.variant.nameSuffix
-import com.grab.grazel.migrate.android.PathResolveMode.DIRECTORY
-import com.grab.grazel.migrate.android.SourceSetType.ASSETS
 import com.grab.grazel.migrate.android.SourceSetType.JAVA_KOTLIN
-import com.grab.grazel.migrate.android.SourceSetType.RESOURCES
 import com.grab.grazel.migrate.dependencies.calculateDirectDependencyTags
 import com.grab.grazel.migrate.kotlin.kotlinParcelizeDeps
 import dagger.Lazy
@@ -105,7 +100,6 @@ constructor(
         matchedVariant: MatchedVariant,
         extension: BaseExtension,
         deps: List<BazelDependency>,
-        sourceSetType: SourceSetType = JAVA_KOTLIN
     ): AndroidLibraryData {
         // Only consider source sets from migratable variants
         val migratableSourceSets = matchedVariant.variant.sourceSets
@@ -115,13 +109,14 @@ constructor(
             extension,
             migratableSourceSets
         ) ?: ""
-        val srcs = androidSources(migratableSourceSets, sourceSetType).toList()
-        val res = androidSources(migratableSourceSets, RESOURCES, DIRECTORY).toList().reversed()
+        val srcs = androidSources(migratableSourceSets, JAVA_KOTLIN).toList()
 
-        val assets = androidSources(migratableSourceSets, ASSETS).toList()
-        val assetsDir = assetsDirectory(migratableSourceSets, assets)
+        val resourceSets = migratableSourceSets.flatMap { it.toResourceSet(project) }
+            .reversed()
+            .toSet()
 
-        val manifestFile = androidManifestParser.androidManifestFile(migratableSourceSets)
+        val manifestFile = androidManifestParser
+            .androidManifestFile(migratableSourceSets)
             ?.let(::relativePath)
 
         val tags = if (grazelExtension.rules.kotlin.enabledTransitiveReduction) {
@@ -133,9 +128,7 @@ constructor(
         return AndroidLibraryData(
             name = name + matchedVariant.nameSuffix,
             srcs = srcs,
-            res = res,
-            assets = assets,
-            assetsDir = assetsDir,
+            resourceSets = resourceSets,
             manifestFile = manifestFile,
             customPackage = packageName,
             packageName = packageName,
@@ -148,19 +141,6 @@ constructor(
             lintConfigs = lintConfigs
         )
     }
-
-    private fun Project.assetsDirectory(
-        sourceSets: List<AndroidSourceSet>,
-        assets: List<String>
-    ): String? {
-        return if (assets.isNotEmpty()) {
-            val assetItem = assets.first()
-            sourceSets
-                .flatMap { it.assets.srcDirs }
-                .map { relativePath(it) }
-                .first { assetItem.contains(it) }
-        } else null
-    }
 }
 
 internal interface AndroidBinaryDataExtractor : AndroidExtractor<AndroidBinaryData>

grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidLibraryData.kt

@@ -38,14 +38,25 @@ internal fun StatementsBuilder.buildResFiles(
 }
 
 internal fun buildResources(
-    resDirs: List<String>,
-) = if (resDirs.isEmpty()) null else
+    resourceSets: Set<BazelSourceSet>,
+) = if (resourceSets.isEmpty()) null else
     Assignee {
         add(
-            statement = resDirs
-                .groupBy { it }
-                .mapValues { emptyMap<String, String>() }
-                .toObject(quoteKeys = true, quoteValues = true, allowEmpty = true)
+            statement = resourceSets.groupBy(
+                keySelector = { it.name },
+                valueTransform = {
+                    mapOf(
+                        "res" to it.res,
+                        "assets" to it.assets,
+                        "manifest" to it.manifest
+                    )
+                })
+                .mapValues { it.value.first() }
+                .toObject(
+                    quoteKeys = true,
+                    quoteValues = true,
+                    allowEmpty = false
+                )
         )
     }
 

grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidTarget.kt

@@ -29,7 +29,7 @@ internal interface AndroidTarget : BazelBuildTarget {
     val enableDataBinding: Boolean
     val enableCompose: Boolean
     val projectName: String
-    val resDirs: List<String>
+    val resourceSets: Set<BazelSourceSet>
     val resValuesData: ResValuesData
     val buildConfigData: BuildConfigData
     val packageName: String
@@ -48,7 +48,7 @@ internal data class AndroidLibraryTarget(
     override val enableDataBinding: Boolean = false,
     override val enableCompose: Boolean = false,
     override val projectName: String = name,
-    override val resDirs: List<String>,
+    override val resourceSets: Set<BazelSourceSet> = emptySet(),
     override val resValuesData: ResValuesData = ResValuesData(),
     override val buildConfigData: BuildConfigData = BuildConfigData(),
     override val packageName: String,
@@ -66,7 +66,7 @@ internal data class AndroidLibraryTarget(
             enableDataBinding = enableDataBinding,
             enableCompose = enableCompose,
             srcsGlob = srcs,
-            resources = buildResources(resDirs),
+            resorceSets = buildResources(resourceSets),
             visibility = visibility,
             deps = deps,
             tags = tags,
@@ -88,7 +88,7 @@ internal data class AndroidBinaryTarget(
     override val enableDataBinding: Boolean = false,
     override val enableCompose: Boolean = false,
     override val projectName: String = name,
-    override val resDirs: List<String>,
+    override val resourceSets: Set<BazelSourceSet> = emptySet(),
     override val resValuesData: ResValuesData = ResValuesData(),
     override val buildConfigData: BuildConfigData = BuildConfigData(),
     override val packageName: String,
@@ -123,7 +123,7 @@ internal data class AndroidBinaryTarget(
             manifest = manifest,
             manifestValues = manifestValues,
             resConfigFilters = resConfigFilters,
-            resources = buildResources(resDirs),
+            resourceSets = buildResources(resourceSets),
             resValuesData = resValuesData,
             deps = deps,
             assetsGlob = assetsGlob,