Update integration test library

bazelbuild · Aug 2, 2024 · d79af18 · d79af18
1 parent 32a52c0
commit d79af18
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 3 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -7,6 +7,10 @@ build --strategy=KotlinCompile=worker
 build --test_output=all
 build --verbose_failures
 
+# Required for windows ci
+startup --windows_enable_symlinks
+common --enable_runfiles
+
 try-import %workspace%/bit-ignore.bazelrc
 
 # User-specific .bazelrc

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -94,17 +94,15 @@ bazel_dep(name = "stardoc", version = "0.5.6", repo_name = "io_bazel_stardoc")
 bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
 
 bazel_dep(name = "rules_testing", version = "0.5.0", dev_dependency = True)
-bazel_dep(name = "rules_bazel_integration_test", version = "0.23.0", dev_dependency = True)
+bazel_dep(name = "rules_bazel_integration_test", version = "0.24.1", dev_dependency = True)
 
 bazel_binaries = use_extension("@rules_bazel_integration_test//:extensions.bzl", "bazel_binaries", dev_dependency = True)
 bazel_binaries.download(version_file = "//:.bazelversion")
 bazel_binaries.download(version = "6.4.0")
-bazel_binaries.download(version = "last_green")
 use_repo(
     bazel_binaries,
     "bazel_binaries",
     "bazel_binaries_bazelisk",
     "build_bazel_bazel_.bazelversion",
     "build_bazel_bazel_6_4_0",
-    "build_bazel_bazel_last_green",
 )
diff --git a/examples/BUILD b/examples/BUILD
@@ -26,6 +26,7 @@ genrule(
         name = "%s_test" % example,
         additional_env_inherit = [
             "ANDROID_HOME",
+            "ANDROID_SDK_ROOT",
             "ANDROID_NDK_HOME",
         ],
         bazel_versions = [version for version in bazel_binaries.versions.all if version not in metadata["exclude"]],

diff --git a/examples/android/WORKSPACE.bzlmod b/examples/android/WORKSPACE.bzlmod
@@ -1,3 +1,13 @@
 android_sdk_repository(name = "androidsdk")
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+    name = "rules_android_ndk",
+    sha256 = "65aedff0cd728bee394f6fb8e65ba39c4c5efb11b29b766356922d4a74c623f5",
+    strip_prefix = "rules_android_ndk-0.1.2",
+    url = "https://github.com/bazelbuild/rules_android_ndk/releases/download/v0.1.2/rules_android_ndk-v0.1.2.tar.gz",
+)
+
+load("@rules_android_ndk//:rules.bzl", "android_ndk_repository")
+
 android_ndk_repository(name = "androidndk")
diff --git a/examples/android/exclude/6.4.0 b/examples/android/exclude/6.4.0
diff --git a/examples/jetpack_compose/WORKSPACE b/examples/jetpack_compose/WORKSPACE
@@ -82,4 +82,14 @@ load("@rules_android//android:rules.bzl", "android_sdk_repository")
 
 android_sdk_repository(name = "androidsdk")
 
+http_archive(
+    name = "rules_android_ndk",
+    sha256 = "65aedff0cd728bee394f6fb8e65ba39c4c5efb11b29b766356922d4a74c623f5",
+    strip_prefix = "rules_android_ndk-0.1.2",
+    url = "https://github.com/bazelbuild/rules_android_ndk/releases/download/v0.1.2/rules_android_ndk-v0.1.2.tar.gz",
+)
+
+load("@rules_android_ndk//:rules.bzl", "android_ndk_repository")
+
 android_ndk_repository(name = "androidndk")
+
diff --git a/src/main/starlark/core/repositories/kotlin/artifacts.bzl b/src/main/starlark/core/repositories/kotlin/artifacts.bzl
@@ -12,6 +12,7 @@ KOTLINC_ARTIFACTS = struct(
             "mutability-annotations-compat": "lib/mutability-annotations-compat.jar",
             "noarg-compiler-plugin": "lib/noarg-compiler-plugin.jar",
             "sam-with-receiver-compiler-plugin": "lib/sam-with-receiver-compiler-plugin.jar",
+            "parcelize-compiler-plugin": "lib/parcelize-compiler-plugin.jar",
         },
         runtime = {
             "jvm-abi-gen": "lib/jvm-abi-gen.jar",