Use kotlin_library wherever possible instead of kt_jvm_library (#123

) Fixes #123
grab · Oct 25, 2023 · 421f7a8 · 421f7a8
1 parent 8d9189d
commit 421f7a8
Show file tree

Hide file tree

Showing 26 changed files with 55 additions and 48 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@bazel_common_dagger//:workspace_defs.bzl", "dagger_rules")
+load("@grab_bazel_common//tools/parcelize:parcelize.bzl", "parcelize_rules")
 load("@io_bazel_rules_kotlin//kotlin:core.bzl", "define_kt_toolchain", "kt_javac_options", "kt_kotlinc_options")
 
 kt_kotlinc_options(
@@ -26,6 +27,8 @@ dagger_rules(
     repo_name = "@bazel_common_maven",
 )
 
+parcelize_rules()
+
 load("@grab_bazel_common//toolchains:toolchains.bzl", "configure_toolchains")
 
 configure_toolchains()
diff --git a/rules/test/multi_test.bzl b/rules/test/multi_test.bzl
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 load(":runtime_resources.bzl", "runtime_resources")
 
 # Unused

diff --git a/tests/android/BUILD.bazel b/tests/android/BUILD.bazel
@@ -13,6 +13,7 @@ android_library(
         },
     },
     deps = [
+        "//:parcelize",
         "@bazel_common_maven//:com_google_android_material_material",
     ],
 )

diff --git a/tests/android/src/main/java/com/grab/test/TestActivity.kt b/tests/android/src/main/java/com/grab/test/TestActivity.kt
@@ -2,6 +2,8 @@ package com.grab.test
 
 import android.app.Activity
 import android.os.Bundle
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 
 class TestActivity : Activity() {
     val material_res = com.google.android.material.R.color.material_blue_grey_950
@@ -13,4 +15,7 @@ class TestActivity : Activity() {
     fun sum(a: Int, b: Int): Int {
         return a + b
     }
+
+    @Parcelize
+    data class ParcelExample(val value: String) : Parcelable
 }
diff --git a/tests/kotlin/BUILD.bazel b/tests/kotlin/BUILD.bazel
@@ -1,7 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
-load("@grab_bazel_common//rules:defs.bzl", "kotlin_test")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library", "kotlin_test")
 
-kt_jvm_library(
+kotlin_library(
     name = "kotlin_test_lib",
     srcs = glob([
         "src/main/java/**/*.kt",

diff --git a/tools/aapt_lite/src/main/java/com/google/devtools/build/android/BUILD.bazel b/tools/aapt_lite/src/main/java/com/google/devtools/build/android/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "source_set",
     srcs = [
         "SourceSet.kt",
@@ -18,7 +18,7 @@ java_library(
     ],
 )
 
-kt_jvm_library(
+kotlin_library(
     name = "resource",
     srcs = [
         "OutputFixer.kt",

diff --git a/tools/aapt_lite/src/main/java/com/grab/aapt/BUILD.bazel b/tools/aapt_lite/src/main/java/com/grab/aapt/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "aapt",
     srcs = glob([
         "*.kt",

diff --git a/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/binding/BUILD.bazel b/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/binding/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "binding",
     srcs = glob([
         "**/*.kt",

diff --git a/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/binding/model/BUILD.bazel b/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/binding/model/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "model",
     srcs = glob([
         "Models.kt",

diff --git a/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/brclass/BUILD.bazel b/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/brclass/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "brclass",
     srcs = glob([
         "BrClassGenerator.kt",

diff --git a/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/common/BUILD.bazel b/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/common/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "common",
     srcs = glob([
         "*.kt",

diff --git a/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/di/BUILD.bazel b/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/di/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "aapt_scope",
     srcs = glob([
         "AaptScope.kt",

diff --git a/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/mapper/BUILD.bazel b/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/mapper/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "mapper",
     srcs = glob([
         "*.kt",

diff --git a/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/rclass/BUILD.bazel b/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/rclass/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "rclass",
     srcs = glob([
         "**/*.kt",

diff --git a/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/util/BUILD.bazel b/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/util/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "util",
     srcs = glob([
         "*.kt",

diff --git a/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/util/jars/BUILD.bazel b/tools/aapt_lite/src/main/java/com/grab/aapt/databinding/util/jars/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "jars",
     srcs = glob([
         "*.kt",

diff --git a/tools/android_mock/BUILD.bazel b/tools/android_mock/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "mocked_android_jar_lib",
     srcs = glob([
         "src/main/java/**/*.kt",

diff --git a/tools/bazel_lib/BUILD.bazel b/tools/bazel_lib/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "bazel_lib",
     srcs = glob([
         "src/main/kotlin/**/*.kt",

diff --git a/tools/binding-adapter-bridge/BUILD.bazel b/tools/binding-adapter-bridge/BUILD.bazel
@@ -1,7 +1,7 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 load("@grab_bazel_common//rules:defs.bzl", "kotlin_test")
 
-kt_jvm_library(
+kotlin_library(
     name = "binding-adapter-processor",
     srcs = glob([
         "src/main/java/**/*.kt",

diff --git a/tools/build_config/src/main/java/com/grab/buildconfig/BUILD.bazel b/tools/build_config/src/main/java/com/grab/buildconfig/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "buildconfig",
     srcs = glob([
         "*.kt",

diff --git a/tools/maven/BUILD.bazel b/tools/maven/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "maven_lib",
     srcs = glob([
         "src/main/kotlin/**/*.kt",

diff --git a/tools/parcelize/parcelize.bzl b/tools/parcelize/parcelize.bzl
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_compiler_plugin")
 
 def parcelize_rules():
@@ -31,7 +31,7 @@ def parcelize_rules():
         ],
     )
 
-    kt_jvm_library(
+    kotlin_library(
         name = "parcelize",
         exported_compiler_plugins = [":parcelize_plugin"],
         visibility = ["//visibility:public"],

diff --git a/tools/test_suite/BUILD.bazel b/tools/test_suite/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "test_suite",
     srcs = glob([
         "src/main/java/**/*.kt",

diff --git a/tools/test_suite_generator/BUILD.bazel b/tools/test_suite_generator/BUILD.bazel
@@ -1,7 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test")
-load("@grab_bazel_common//rules:defs.bzl", "kotlin_test")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library", "kotlin_test")
 
-kt_jvm_library(
+kotlin_library(
     name = "test_suite_generator_lib",
     srcs = glob([
         "src/main/java/**/*.kt",

diff --git a/tools/worker/BUILD.bazel b/tools/worker/BUILD.bazel
@@ -1,7 +1,7 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 load("@grab_bazel_common//rules:defs.bzl", "kotlin_test")
 
-kt_jvm_library(
+kotlin_library(
     name = "worker_lib",
     srcs = glob([
         "src/main/kotlin/**/*.kt",

diff --git a/tools/worker/test_worker/BUILD.bazel b/tools/worker/test_worker/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+load("@grab_bazel_common//rules:defs.bzl", "kotlin_library")
 
-kt_jvm_library(
+kotlin_library(
     name = "test_worker_lib",
     srcs = glob([
         "src/main/kotlin/**/*.kt",
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ android_library( @@
             },
         },
         deps = [
+            "//:parcelize",
             "@bazel_common_maven//:com_google_android_material_material",
         ],
     )
@@ Expand Down @@