Merge pull request #79 from bazel-ios/amber/rename-indexstore-dir

Separate objective-c indexstore units and records by objc_library

.github/workflows/tests.yml

@@ -48,7 +48,7 @@ jobs:
         run: |
           set -euo pipefail
           bazelisk query 'kind(xcodeproj, tests/macos/xcodeproj/...)' | xargs -n 1 bazelisk run
-          bazel query 'attr(executable, 1, kind(genrule, tests/macos/xcodeproj/...))' | xargs -n 1 bazelisk run
+          bazelisk query 'attr(executable, 1, kind(genrule, tests/macos/xcodeproj/...))' | xargs -n 1 bazelisk run
           git diff --exit-code tests/macos/xcodeproj
       - name: Run Xcode builds
         run: ./tests/macos/xcodeproj/build.sh

rules/library.bzl

@@ -563,7 +563,10 @@ def apple_library(name, library_tools = {}, export_private_headers = True, names
 
     objc_copts.append("-I.")
 
-    objc_copts.extend(("-index-store-path", "$(GENDIR)/rules_ios_apple_library_objc.indexstore"))
+    objc_copts.extend(("-index-store-path", "$(GENDIR)/{package}/rules_ios_objc_library_{libname}.indexstore".format(
+        package = native.package_name(),
+        libname = objc_libname,
+    )))
     objc_library(
         name = objc_libname,
         srcs = objc_sources + objc_private_hdrs + objc_non_exported_hdrs,

tests/macos/xcodeproj/BUILD.bazel

@@ -92,8 +92,8 @@ cat <<'EOS' > $@
 #!/bin/sh
 set -euxo pipefail
 rm -fr {package_name}/{target_name}.xcodeproj
-bazel run {package_name}:{target_name}
-bazel run {package_name}:{target_name}
+bazelisk run {package_name}:{target_name}
+bazelisk run {package_name}:{target_name}
 EOS
     """.format(
         package_name = package_name(),