Add compose support for android_instrumentation_binary (#126)

grab · Mar 29, 2024 · 90ef85b · 90ef85b
1 parent a84d8b5
commit 90ef85b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 2 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -27,7 +27,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "grab_bazel_common",
-    commit = "092435fb286705c4dcd845c93c9d84e94a4088d9",
+    commit = "7ce14f2063b19b1e700bb9fa51cc944626545450",
     remote = "https://github.com/grab/grab-bazel-common.git",
 )
 

diff --git a/build.gradle b/build.gradle
@@ -98,7 +98,7 @@ grazel {
     rules {
         bazelCommon {
             gitRepository {
-                commit = "092435fb286705c4dcd845c93c9d84e94a4088d9"
+                commit = "7ce14f2063b19b1e700bb9fa51cc944626545450"
                 remote = "https://github.com/grab/grab-bazel-common.git"
             }
             toolchains {

diff --git a/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/AndroidRules.kt b/grazel-gradle-plugin/src/main/kotlin/com/grab/grazel/bazel/rules/AndroidRules.kt
@@ -336,6 +336,7 @@ fun StatementsBuilder.androidInstrumentationBinary(
     resourceStripPrefix: String? = null,
     resourceFiles: List<Assignee> = emptyList(),
     testInstrumentationRunner: String? = null,
+    enableCompose: Boolean = false,
 ) {
     load(
         "@$GRAB_BAZEL_COMMON//rules:defs.bzl",
@@ -377,5 +378,9 @@ fun StatementsBuilder.androidInstrumentationBinary(
         testInstrumentationRunner?.let {
             "test_instrumentation_runner" `=` it.quote
         }
+
+        if (enableCompose) {
+            "enable_compose" `=` enableCompose.toString().capitalize()
+        }
     }
 }
diff --git a/...lugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidInstrumentationBinaryData.kt b/...lugin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidInstrumentationBinaryData.kt
@@ -32,4 +32,5 @@ internal data class AndroidInstrumentationBinaryData(
     val resourceStripPrefix: String? = null,
     val srcs: List<String>,
     val testInstrumentationRunner: String? = null,
+    val compose: Boolean = false,
 )
diff --git a/.../main/kotlin/com/grab/grazel/migrate/android/AndroidInstrumentationBinaryDataExtractor.kt b/.../main/kotlin/com/grab/grazel/migrate/android/AndroidInstrumentationBinaryDataExtractor.kt
@@ -24,6 +24,7 @@ import com.grab.grazel.gradle.dependencies.BuildGraphType
 import com.grab.grazel.gradle.dependencies.DependenciesDataSource
 import com.grab.grazel.gradle.dependencies.DependencyGraphs
 import com.grab.grazel.gradle.dependencies.GradleDependencyToBazelDependency
+import com.grab.grazel.gradle.hasCompose
 import com.grab.grazel.gradle.variant.AndroidVariantDataSource
 import com.grab.grazel.gradle.variant.MatchedVariant
 import com.grab.grazel.gradle.variant.getMigratableBuildVariants
@@ -144,6 +145,7 @@ internal class DefaultAndroidInstrumentationBinaryDataExtractor
             srcs = srcs,
             testInstrumentationRunner = testInstrumentationRunner,
             manifestValues = manifestValues,
+            compose = hasCompose,
         )
     }
 }

diff --git a/...gin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidInstrumentationBinaryTarget.kt b/...gin/src/main/kotlin/com/grab/grazel/migrate/android/AndroidInstrumentationBinaryTarget.kt
@@ -39,6 +39,7 @@ internal data class AndroidInstrumentationBinaryTarget(
     val resourceStripPrefix: String? = null,
     val resourceFiles: List<String>,
     val testInstrumentationRunner: String? = null,
+    val compose: Boolean,
 ) : BazelBuildTarget {
 
     override fun statements(builder: StatementsBuilder) = builder {
@@ -56,6 +57,7 @@ internal data class AndroidInstrumentationBinaryTarget(
             resourceStripPrefix = resourceStripPrefix,
             resourceFiles = buildResFiles(resourceFiles),
             testInstrumentationRunner = testInstrumentationRunner,
+            enableCompose = compose,
         )
     }
 }
diff --git a/...c/main/kotlin/com/grab/grazel/migrate/target/AndroidInstrumentationBinaryTargetBuilder.kt b/...c/main/kotlin/com/grab/grazel/migrate/target/AndroidInstrumentationBinaryTargetBuilder.kt
@@ -82,6 +82,7 @@ internal class AndroidInstrumentationBinaryTargetBuilder
         resourceFiles = resourceFiles,
         srcs = srcs,
         testInstrumentationRunner = testInstrumentationRunner,
+        compose = compose,
     )
 }
 

diff --git a/sample-android/BUILD.bazel b/sample-android/BUILD.bazel
@@ -417,6 +417,7 @@ android_instrumentation_binary(
     ],
     custom_package = "com.grab.grazel.android.sample",
     debug_key = "//buildsystem:debug-keystore",
+    enable_compose = True,
     instruments = ":sample-android-flavor1-free-debug",
     manifest_values = {
         "versionCode": "1",
@@ -472,6 +473,7 @@ android_instrumentation_binary(
     ],
     custom_package = "com.grab.grazel.android.sample",
     debug_key = "//buildsystem:debug-keystore",
+    enable_compose = True,
     instruments = ":sample-android-flavor1-paid-debug",
     manifest_values = {
         "versionCode": "1",
@@ -527,6 +529,7 @@ android_instrumentation_binary(
     ],
     custom_package = "com.grab.grazel.android.sample",
     debug_key = "//buildsystem:debug-keystore",
+    enable_compose = True,
     instruments = ":sample-android-flavor2-free-debug",
     manifest_values = {
         "versionCode": "1",
@@ -582,6 +585,7 @@ android_instrumentation_binary(
     ],
     custom_package = "com.grab.grazel.android.sample",
     debug_key = "//buildsystem:debug-keystore",
+    enable_compose = True,
     instruments = ":sample-android-flavor2-paid-debug",
     manifest_values = {
         "versionCode": "1",