diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e864d3bae..2abee0e7e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -82,8 +82,8 @@ jobs: name: bazel-testlogs path: bazel-testlogs - lts_ios_integration_tests: - name: Build and Test ( Virtual Frameworks + LTS ) + bazel_5_ios_integration_tests: + name: Build and Test ( Virtual Frameworks + Bazel 5 ) runs-on: macos-12 env: USE_BAZEL_VERSION: 5.3.2 @@ -109,6 +109,31 @@ jobs: name: bazel-testlogs path: bazel-testlogs + rules_apple_2_ios_integration_tests: + name: Build and Test ( Virtual Frameworks + rules_apple 2.x ) + runs-on: macos-12 + env: + USE_BAZEL_VERSION: 6.1.2 + steps: + - uses: actions/checkout@v3 + - name: Preflight Env + run: .github/workflows/preflight_env.sh --no-bzlmod + - name: Build and Test + run: | + # iOS tests + bazelisk build \ + --config=ci_with_caches \ + --config=ios \ + --config=vfs \ + -- \ + //tests/ios/... + + - uses: actions/upload-artifact@v2 + if: failure() + with: + name: bazel-testlogs + path: bazel-testlogs + build_arm64_simulator: name: Build arm64 Simulator runs-on: macos-12 @@ -149,7 +174,10 @@ jobs: steps: - uses: actions/checkout@v3 - name: Preflight Env - run: .github/workflows/preflight_env.sh + # stardoc latest version and bzlmod is broken with this in a few ways + # Please revert this to the version which worked reasonablly: + # https://github.com/bazelbuild/stardoc/issues/192 + run: .github/workflows/preflight_env.sh --no-bzlmod # Note: we need to pass the absolute to the Bazel run - name: buildifier run: | @@ -200,12 +228,16 @@ jobs: path: bazel-testlogs multi_arch_support: + # i386 was removed on rules_apple 3.x.x - this test case needs reworking + # to exemplify fat binaries on the latest version name: Build iOS App for Multiple Architecture runs-on: macos-12 + env: + USE_BAZEL_VERSION: 6.1.2 steps: - uses: actions/checkout@v3 - name: Preflight Env - run: .github/workflows/preflight_env.sh + run: .github/workflows/preflight_env.sh --no-bzlmod - name: Build App run: | bazelisk build \ diff --git a/MODULE.bazel b/MODULE.bazel index ba65ba387..324cfa11f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep( ) bazel_dep( name = "rules_apple", - version = "2.3.0", + version = "3.0.0", repo_name = "build_bazel_rules_apple", ) bazel_dep( @@ -60,6 +60,12 @@ bazel_dep( repo_name = "io_bazel_stardoc", ) +rules_apple_api_deps = use_extension("//rules:module_extensions.bzl", "rules_apple_api_deps") +use_repo( + rules_apple_api_deps, + "rules_apple_api", +) + # Load non-bzlmod dependencies from rules_ios non_module_deps = use_extension("//rules:module_extensions.bzl", "non_module_deps") use_repo( diff --git a/data/BUILD.bazel b/data/BUILD.bazel index 45c22d0bc..5d5a69eee 100644 --- a/data/BUILD.bazel +++ b/data/BUILD.bazel @@ -13,5 +13,6 @@ bzl_library( "xcspec_evals.bzl", "xcspecs.bzl", ], + tags = ["manual"], visibility = ["//visibility:public"], ) diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel index a5a65b480..aef9ae335 100644 --- a/docs/BUILD.bazel +++ b/docs/BUILD.bazel @@ -10,12 +10,12 @@ _DOC_SRCS = [ "apple_patched", "extension", "features", - "force_load_direct_deps", "framework", "hmap", "import_middleman", "library", "plists", + "force_load_direct_deps", "precompiled_apple_resource_bundle", "providers", "substitute_build_settings", @@ -33,6 +33,7 @@ _DOC_SRCS = [ out = file + ".gen.md", input = "//rules:%s.bzl" % file, tags = [ + "manual", "no-cache", "no-sandbox", # https://github.com/bazelbuild/stardoc/issues/112 ], diff --git a/docs/force_load_direct_deps_doc.md b/docs/force_load_direct_deps_doc.md index 75193f6b2..fc9fa68a7 100755 --- a/docs/force_load_direct_deps_doc.md +++ b/docs/force_load_direct_deps_doc.md @@ -7,7 +7,7 @@ ## force_load_direct_deps 
-force_load_direct_deps(name, deps, should_force_load)
+force_load_direct_deps(name, deps, minimum_os_version, platform_type, should_force_load)
A rule to link with `-force_load` for direct`deps` @@ -40,7 +40,9 @@ perspective so it isn't used. | Name | Description | Type | Mandatory | Default | | :------------- | :------------- | :------------- | :------------- | :------------- | | name | A unique name for this target. | Name | required | | -| deps | - | List of labels | optional | `[]` | +| deps | Deps | List of labels | required | | +| minimum_os_version | Internal - currently rules_ios the dict `platforms` | String | optional | `""` | +| platform_type | Internal - currently rules_ios uses the dict `platforms` | String | optional | `""` | | should_force_load | Allows parametrically enabling the functionality in this rule. | Boolean | optional | `True` | diff --git a/rules/BUILD.bazel b/rules/BUILD.bazel index a75affaf0..2fc6e9c21 100644 --- a/rules/BUILD.bazel +++ b/rules/BUILD.bazel @@ -14,18 +14,25 @@ genrule( bzl_library( name = "providers", srcs = ["providers.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], ) bzl_library( name = "transition_support", srcs = ["transition_support.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], + deps = [ + "@build_bazel_apple_support//lib:apple_support", + "@rules_apple_api//:api", + ], ) bzl_library( name = "hmap", srcs = ["hmap.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = ["@build_bazel_rules_swift//swift"], ) @@ -33,25 +40,33 @@ bzl_library( bzl_library( name = "features", srcs = ["features.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], ) bzl_library( name = "substitute_build_settings", srcs = ["substitute_build_settings.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], ) bzl_library( name = "force_load_direct_deps", srcs = ["force_load_direct_deps.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], - deps = [":providers"], + deps = [ + ":providers", + ":transition_support", + "@rules_apple_api//:api", + ], ) bzl_library( name = "xcconfig.doc", srcs = ["xcconfig.doc.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = ["//rules/library:xcconfig"], ) @@ -59,6 +74,7 @@ bzl_library( bzl_library( name = "plists", srcs = ["plists.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":substitute_build_settings", @@ -72,6 +88,7 @@ bzl_library( bzl_library( name = "vfs_overlay.doc", srcs = ["vfs_overlay.doc.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = ["//rules/framework:vfs_overlay"], ) @@ -79,6 +96,7 @@ bzl_library( bzl_library( name = "precompiled_apple_resource_bundle", srcs = ["precompiled_apple_resource_bundle.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":transition_support", @@ -93,17 +111,20 @@ bzl_library( bzl_library( name = "import_middleman", srcs = ["import_middleman.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":features", "//rules/internal:objc_provider_utils", "@build_bazel_rules_apple//apple", + "@rules_apple_api//:api", ], ) bzl_library( name = "library", srcs = ["library.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":hmap", @@ -121,12 +142,14 @@ bzl_library( "@build_bazel_rules_apple//apple:apple_static_library", "@build_bazel_rules_apple//apple:resources", "@build_bazel_rules_swift//swift", + "@rules_apple_api//:api", ], ) bzl_library( name = "framework", srcs = ["framework.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":features", @@ -142,12 +165,14 @@ bzl_library( "@bazel_tools//tools/cpp:toolchain_utils.bzl", "@build_bazel_rules_apple//apple", "@build_bazel_rules_swift//swift", + "@rules_apple_api//:api", ], ) bzl_library( name = "apple_patched", srcs = ["apple_patched.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":features", @@ -161,6 +186,7 @@ bzl_library( bzl_library( name = "app_clip", srcs = ["app_clip.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":force_load_direct_deps", @@ -173,6 +199,7 @@ bzl_library( bzl_library( name = "app", srcs = ["app.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":force_load_direct_deps", @@ -186,18 +213,22 @@ bzl_library( bzl_library( name = "extension", srcs = ["extension.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":force_load_direct_deps", ":plists", + ":transition_support", "//rules/internal:framework_middleman", "@build_bazel_rules_apple//apple:ios", + "@rules_apple_api//:api", ], ) bzl_library( name = "test", srcs = ["test.bzl"], + tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":library", diff --git a/rules/app.bzl b/rules/app.bzl index ea0f8b4d8..3754785c6 100644 --- a/rules/app.bzl +++ b/rules/app.bzl @@ -96,6 +96,8 @@ def ios_application( deps = kwargs.get("deps", []) + library.lib_names, tags = ["manual"], testonly = testonly, + platform_type = "ios", + minimum_os_version = application_kwargs.get("minimum_os_version"), ) # Setup framework middlemen - need to process deps and libs @@ -105,6 +107,8 @@ def ios_application( framework_deps = kwargs.get("deps", []) + library.lib_names, tags = ["manual"], testonly = testonly, + platform_type = "ios", + minimum_os_version = application_kwargs.get("minimum_os_version"), ) frameworks = [fw_name] + kwargs.pop("frameworks", []) @@ -114,6 +118,8 @@ def ios_application( deps = kwargs.get("deps", []) + library.lib_names, tags = ["manual"], testonly = testonly, + platform_type = "ios", + minimum_os_version = application_kwargs.get("minimum_os_version"), ) deps = [dep_name] + [force_load_name] diff --git a/rules/force_load_direct_deps.bzl b/rules/force_load_direct_deps.bzl index 50ab8f5f9..b9e864869 100644 --- a/rules/force_load_direct_deps.bzl +++ b/rules/force_load_direct_deps.bzl @@ -1,4 +1,6 @@ load("//rules:providers.bzl", "AvoidDepsInfo") +load("//rules:transition_support.bzl", "split_transition_rule_attrs", "transition_support") +load("@bazel_skylib//lib:dicts.bzl", "dicts") def _impl(ctx): if not ctx.attr.should_force_load: @@ -30,13 +32,30 @@ def _impl(ctx): force_load_direct_deps = rule( implementation = _impl, - attrs = { - "deps": attr.label_list(), + attrs = dicts.add(split_transition_rule_attrs, { + "deps": attr.label_list( + cfg = transition_support.split_transition, + mandatory = True, + doc = + "Deps", + ), "should_force_load": attr.bool( default = True, doc = "Allows parametrically enabling the functionality in this rule.", ), - }, + "platform_type": attr.string( + mandatory = False, + doc = + """Internal - currently rules_ios uses the dict `platforms` +""", + ), + "minimum_os_version": attr.string( + mandatory = False, + doc = + """Internal - currently rules_ios the dict `platforms` +""", + ), + }), doc = """ A rule to link with `-force_load` for direct`deps` diff --git a/rules/framework.bzl b/rules/framework.bzl index 812a60a37..482f3e312 100644 --- a/rules/framework.bzl +++ b/rules/framework.bzl @@ -11,7 +11,6 @@ load("@bazel_skylib//lib:partial.bzl", "partial") load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") load("@build_bazel_rules_apple//apple/internal:apple_product_type.bzl", "apple_product_type") -load("@build_bazel_rules_apple//apple/internal:bundling_support.bzl", "bundling_support") load("@build_bazel_rules_apple//apple/internal:features_support.bzl", "features_support") load("@build_bazel_rules_apple//apple/internal:linking_support.bzl", "linking_support") load("@build_bazel_rules_apple//apple/internal:outputs.bzl", "outputs") @@ -25,6 +24,8 @@ load("@build_bazel_rules_apple//apple/internal:apple_toolchains.bzl", "AppleMacT load("@build_bazel_rules_apple//apple/internal:swift_support.bzl", "swift_support") load("@build_bazel_rules_apple//apple/internal/utils:clang_rt_dylibs.bzl", "clang_rt_dylibs") load("@build_bazel_rules_apple//apple:providers.bzl", "AppleBundleInfo", "IosFrameworkBundleInfo") +load("@rules_apple_api//:providers.bzl", "new_applebundleinfo", "new_iosframeworkbundleinfo") +load("@rules_apple_api//:version.bzl", "apple_api_version") load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftInfo", "swift_clang_module_aspect", "swift_common") load( "@build_bazel_rules_apple//apple/internal/aspects:resource_aspect.bzl", @@ -105,6 +106,25 @@ def apple_framework( framework_deps = [] + platforms = library.platforms if library.platforms else {} + + # At the time of writing this is still used in the output path + # computation + minimum_os_version = select({ + "@build_bazel_rules_ios//rules/apple_platform:ios": platforms.get("ios", ""), + "@build_bazel_rules_ios//rules/apple_platform:macos": platforms.get("macos", ""), + "@build_bazel_rules_ios//rules/apple_platform:tvos": platforms.get("tvos", ""), + "@build_bazel_rules_ios//rules/apple_platform:watchos": platforms.get("watchos", ""), + "//conditions:default": "", + }) + platform_type = select({ + "@build_bazel_rules_ios//rules/apple_platform:ios": "ios", + "@build_bazel_rules_ios//rules/apple_platform:macos": "macos", + "@build_bazel_rules_ios//rules/apple_platform:tvos": "tvos", + "@build_bazel_rules_ios//rules/apple_platform:watchos": "watchos", + "//conditions:default": "", + }) + # Setup force loading here - only for direct deps / direct libs and when `link_dynamic` is set. force_load_name = name + ".force_load_direct_deps" force_load_direct_deps( @@ -113,11 +133,12 @@ def apple_framework( should_force_load = framework_packaging_kwargs.get("link_dynamic", False), testonly = testonly, tags = ["manual"], + minimum_os_version = minimum_os_version, + platform_type = platform_type, ) framework_deps.append(force_load_name) framework_deps += library.lib_names - platforms = library.platforms if library.platforms else {} apple_framework_packaging( name = name, framework_name = library.namespace, @@ -129,23 +150,9 @@ def apple_framework( platforms = platforms, private_deps = kwargs.get("private_deps", []), library_linkopts = library.linkopts, - # At the time of writing this is still used in the output path - # computation - minimum_os_version = select({ - "@build_bazel_rules_ios//rules/apple_platform:ios": platforms.get("ios", ""), - "@build_bazel_rules_ios//rules/apple_platform:macos": platforms.get("macos", ""), - "@build_bazel_rules_ios//rules/apple_platform:tvos": platforms.get("tvos", ""), - "@build_bazel_rules_ios//rules/apple_platform:watchos": platforms.get("watchos", ""), - "//conditions:default": "", - }), - platform_type = select({ - "@build_bazel_rules_ios//rules/apple_platform:ios": "ios", - "@build_bazel_rules_ios//rules/apple_platform:macos": "macos", - "@build_bazel_rules_ios//rules/apple_platform:tvos": "tvos", - "@build_bazel_rules_ios//rules/apple_platform:watchos": "watchos", - "//conditions:default": "", - }), testonly = testonly, + minimum_os_version = minimum_os_version, + platform_type = platform_type, **framework_packaging_kwargs ) @@ -583,21 +590,32 @@ def _merge_root_infoplists(ctx): current_apple_platform = transition_support.current_apple_platform(apple_fragment = ctx.fragments.apple, xcode_config = ctx.attr._xcode_config) platform_type = str(current_apple_platform.platform.platform_type) apple_mac_toolchain_info = ctx.attr._toolchain[AppleMacToolsToolchainInfo] - rule_descriptor = rule_support.rule_descriptor_no_ctx(platform_type, apple_product_type.static_framework) + if hasattr(rule_support, "rule_descriptor_no_ctx"): + descriptor_fn = rule_support.rule_descriptor_no_ctx + else: + descriptor_fn = rule_support.rule_descriptor + + rule_descriptor = descriptor_fn( + platform_type = platform_type, + product_type = apple_product_type.static_framework, + ) + features = features_support.compute_enabled_features( + requested_features = ctx.features, + unsupported_features = ctx.disabled_features, + ) resource_actions.merge_root_infoplists( actions = ctx.actions, bundle_name = bundle_name, bundle_id = ctx.attr.bundle_id, bundle_extension = ctx.attr.bundle_extension, - executable_name = bundle_name, environment_plist = ctx.file.environment_plist, input_plists = ctx.files.infoplists, launch_storyboard = None, output_plist = output_plist, output_pkginfo = None, output_discriminator = "framework", - platform_prerequisites = _platform_prerequisites(ctx, rule_descriptor, platform_type), + platform_prerequisites = _platform_prerequisites(ctx, rule_descriptor, platform_type, features), resolved_plisttool = apple_mac_toolchain_info.resolved_plisttool, rule_descriptor = rule_descriptor, rule_label = ctx.label, @@ -614,24 +632,34 @@ def _attrs_for_split_slice(attrs_by_split_slices, split_slice_key): else: return attrs_by_split_slices[split_slice_key] -def _platform_prerequisites(ctx, rule_descriptor, platform_type): +def _platform_prerequisites(ctx, rule_descriptor, platform_type, features): # Consider plumbing this in deps = getattr(ctx.attr, "deps", None) uses_swift = swift_support.uses_swift(deps) if deps else False + apple_xplat_toolchain_info = ctx.attr._xplat_toolchain[AppleXPlatToolsToolchainInfo] + if apple_api_version == "3.0": + version_args = { + "build_settings": apple_xplat_toolchain_info.build_settings, + } + else: + version_args = { + "disabled_features": ctx.disabled_features, + } + return platform_support.platform_prerequisites( apple_fragment = ctx.fragments.apple, config_vars = ctx.var, cpp_fragment = ctx.fragments.cpp, device_families = rule_descriptor.allowed_device_families, - disabled_features = ctx.disabled_features, explicit_minimum_deployment_os = ctx.attr.minimum_deployment_os_version, explicit_minimum_os = ctx.attr.minimum_os_version, - features = ctx.features, + features = features, objc_fragment = ctx.fragments.objc, platform_type_string = platform_type, uses_swift = uses_swift, xcode_version_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig], + **version_args ) def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): @@ -649,14 +677,6 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): # processed infoplit its possible, but validate for the common case fail("Missing bundle_id: Info.plist actions require one") - # Determine the interface version of rules_apple. We don't want to force - # "hail mary" type rules and Bazel bumps on the community to run a given - # version of rules_ios and the API we depend on is relatively lts_5. If - # this ceases to be the case than consider mainlining the few components we - # use from it to remove this complexity. - rules_apple_api_version = getattr(bundling_support, "rule_api_version", None) - use_lts_5_rules_apple_api = rules_apple_api_version == 1.0 - bundle_name = ctx.attr.framework_name bundle_extension = ".framework" features = features_support.compute_enabled_features( @@ -673,8 +693,15 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): resource_deps = ctx.attr.deps + ctx.attr.transitive_deps + ctx.attr.data current_apple_platform = transition_support.current_apple_platform(apple_fragment = ctx.fragments.apple, xcode_config = ctx.attr._xcode_config) platform_type = str(current_apple_platform.platform.platform_type) - rule_descriptor = rule_support.rule_descriptor_no_ctx(platform_type, apple_product_type.framework) - platform_prerequisites = _platform_prerequisites(ctx, rule_descriptor, platform_type) + if hasattr(rule_support, "rule_descriptor_no_ctx"): + descriptor_fn = rule_support.rule_descriptor_no_ctx + else: + descriptor_fn = rule_support.rule_descriptor + rule_descriptor = descriptor_fn( + platform_type = platform_type, + product_type = apple_product_type.framework, + ) + platform_prerequisites = _platform_prerequisites(ctx, rule_descriptor, platform_type, features) signed_frameworks = [] if provisioning_profile: signed_frameworks = [ @@ -699,70 +726,130 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): attr = ctx.attr, res_attrs = ["infoplists"], ) - link_result = linking_support.register_binary_linking_action( - ctx, - avoid_deps = avoid_deps, - entitlements = None, - extra_linkopts = extra_linkopts, - platform_prerequisites = platform_prerequisites, - stamp = ctx.attr.stamp, - ) + if apple_api_version == "3.0": + link_result = linking_support.register_binary_linking_action( + ctx, + avoid_deps = avoid_deps, + entitlements = None, + exported_symbols_lists = ctx.files.exported_symbols_lists, + extra_linkopts = extra_linkopts, + platform_prerequisites = platform_prerequisites, + stamp = ctx.attr.stamp, + ) + else: + link_result = linking_support.register_binary_linking_action( + ctx, + avoid_deps = avoid_deps, + entitlements = None, + extra_linkopts = extra_linkopts, + platform_prerequisites = platform_prerequisites, + stamp = ctx.attr.stamp, + ) + binary_artifact = link_result.binary debug_outputs = linking_support.debug_outputs_by_architecture(link_result.outputs) - archive_for_embedding = outputs.archive_for_embedding( - actions = actions, - bundle_name = bundle_name, - bundle_extension = bundle_extension, - executable_name = bundle_name, - label_name = label.name, - rule_descriptor = rule_descriptor, - platform_prerequisites = platform_prerequisites, - predeclared_outputs = predeclared_outputs, - ) - - dep_frameworks = ctx.attr.frameworks - - # TODO(jmarino) - consider how to better handle frameworks of frameworks - processor_partials = [] - - processor_partials.append( - partials.apple_bundle_info_partial( + if apple_api_version == "3.0": + archive_for_embedding = outputs.archive_for_embedding( actions = actions, - bundle_extension = bundle_extension, - bundle_id = bundle_id, bundle_name = bundle_name, - executable_name = bundle_name, + bundle_extension = bundle_extension, label_name = label.name, + rule_descriptor = rule_descriptor, platform_prerequisites = platform_prerequisites, predeclared_outputs = predeclared_outputs, - product_type = apple_product_type.framework, - ), - ) - processor_partials.append( - partials.binary_partial( + ) + else: + archive_for_embedding = outputs.archive_for_embedding( actions = actions, - binary_artifact = binary_artifact, bundle_name = bundle_name, executable_name = bundle_name, + bundle_extension = bundle_extension, label_name = label.name, - ), - ) + rule_descriptor = rule_descriptor, + platform_prerequisites = platform_prerequisites, + predeclared_outputs = predeclared_outputs, + ) + + dep_frameworks = ctx.attr.frameworks + + # TODO(jmarino) - consider how to better handle frameworks of frameworks + processor_partials = [] + + if apple_api_version == "3.0": + processor_partials.append( + partials.apple_bundle_info_partial( + actions = actions, + bundle_extension = bundle_extension, + bundle_id = bundle_id, + bundle_name = bundle_name, + executable_name = bundle_name, + label_name = label.name, + platform_prerequisites = platform_prerequisites, + predeclared_outputs = predeclared_outputs, + product_type = apple_product_type.framework, + rule_descriptor = rule_descriptor, + ), + ) + else: + processor_partials.append( + partials.apple_bundle_info_partial( + actions = actions, + bundle_extension = bundle_extension, + bundle_id = bundle_id, + bundle_name = bundle_name, + executable_name = bundle_name, + label_name = label.name, + platform_prerequisites = platform_prerequisites, + predeclared_outputs = predeclared_outputs, + product_type = apple_product_type.framework, + ), + ) + processor_partials.append( - partials.codesigning_dossier_partial( + partials.binary_partial( + executable_name = bundle_name, actions = actions, - apple_mac_toolchain_info = apple_mac_toolchain_info, - bundle_extension = bundle_extension, - bundle_location = processor.location.framework, + binary_artifact = binary_artifact, bundle_name = bundle_name, - embed_target_dossiers = False, - embedded_targets = dep_frameworks, label_name = label.name, - platform_prerequisites = platform_prerequisites, - provisioning_profile = provisioning_profile, - rule_descriptor = rule_descriptor, ), ) + if apple_api_version == "3.0": + processor_partials.append( + partials.codesigning_dossier_partial( + actions = actions, + apple_mac_toolchain_info = apple_mac_toolchain_info, + apple_xplat_toolchain_info = apple_xplat_toolchain_info, + bundle_extension = bundle_extension, + bundle_location = processor.location.framework, + bundle_name = bundle_name, + embed_target_dossiers = False, + embedded_targets = dep_frameworks, + label_name = label.name, + platform_prerequisites = platform_prerequisites, + predeclared_outputs = predeclared_outputs, + provisioning_profile = provisioning_profile, + rule_descriptor = rule_descriptor, + ), + ) + else: + processor_partials.append( + partials.codesigning_dossier_partial( + actions = actions, + apple_mac_toolchain_info = apple_mac_toolchain_info, + bundle_extension = bundle_extension, + bundle_location = processor.location.framework, + bundle_name = bundle_name, + embed_target_dossiers = False, + embedded_targets = dep_frameworks, + label_name = label.name, + platform_prerequisites = platform_prerequisites, + provisioning_profile = provisioning_profile, + rule_descriptor = rule_descriptor, + ), + ) + processor_partials.append( partials.clang_rt_dylibs_partial( actions = actions, @@ -775,7 +862,7 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): ), ) - if use_lts_5_rules_apple_api: + if apple_api_version == "1.0": processor_partials.append( partials.debug_symbols_partial( actions = actions, @@ -791,7 +878,7 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): bin_root_path = bin_root_path, ), ) - else: + elif apple_api_version == "2.0": processor_partials.append( partials.debug_symbols_partial( actions = actions, @@ -805,6 +892,23 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): platform_prerequisites = platform_prerequisites, ), ) + else: + processor_partials.append( + partials.debug_symbols_partial( + actions = actions, + bundle_extension = bundle_extension, + bundle_name = bundle_name, + debug_dependencies = dep_frameworks, + dsym_binaries = debug_outputs.dsym_binaries, + label_name = label.name, + linkmaps = debug_outputs.linkmaps, + dsym_info_plist_template = apple_mac_toolchain_info.dsym_info_plist_template, + platform_prerequisites = platform_prerequisites, + resolved_plisttool = apple_mac_toolchain_info.resolved_plisttool, + rule_label = label, + version = None, + ), + ) processor_partials.append( partials.embedded_bundles_partial( @@ -822,7 +926,7 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): ), ) - if use_lts_5_rules_apple_api: + if apple_api_version == "1.0": processor_partials.append( partials.framework_provider_partial( actions = actions, @@ -901,6 +1005,12 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): ), ) + if apple_api_version == "3.0": + process_version_args = {} + else: + process_version_args = { + "executable_name": bundle_name, + } processor_result = processor.process( actions = actions, apple_mac_toolchain_info = apple_mac_toolchain_info, @@ -908,7 +1018,6 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): bundle_name = bundle_name, codesign_inputs = [], codesignopts = [], - executable_name = bundle_name, features = features, ipa_post_processor = None, partials = processor_partials, @@ -919,11 +1028,13 @@ def _bundle_dynamic_framework(ctx, is_extension_safe, avoid_deps): provisioning_profile = provisioning_profile, rule_descriptor = rule_descriptor, rule_label = label, + **process_version_args ) + return struct( files = processor_result.output_files, providers = [ - IosFrameworkBundleInfo(), + new_iosframeworkbundleinfo(), OutputGroupInfo( **outputs.merge_output_groups( link_result.output_groups, @@ -945,7 +1056,7 @@ def _bundle_static_framework(ctx, is_extension_safe, current_apple_platform, out # Static packaging - archives are passed from library deps return struct(files = depset([]), providers = [ - AppleBundleInfo( + new_applebundleinfo( archive = None, archive_root = None, binary = outputs.binary, @@ -1092,7 +1203,7 @@ apple_framework_packaging = rule( ), "deps": attr.label_list( mandatory = True, - cfg = apple_common.multi_arch_split, + cfg = transition_support.split_transition, aspects = [apple_resource_aspect], doc = """Objc or Swift rules to be packed by the framework rule @@ -1100,7 +1211,7 @@ apple_framework_packaging = rule( ), "private_deps": attr.label_list( mandatory = False, - cfg = apple_common.multi_arch_split, + cfg = transition_support.split_transition, aspects = [apple_resource_aspect], doc = """Objc or Swift private rules to be packed by the framework rule @@ -1108,7 +1219,7 @@ apple_framework_packaging = rule( ), "data": attr.label_list( mandatory = False, - cfg = apple_common.multi_arch_split, + cfg = transition_support.split_transition, allow_files = True, doc = """Objc or Swift rules to be packed by the framework rule @@ -1130,7 +1241,7 @@ The default behavior bakes this into the top level app. When false, it's statica ), "vfs": attr.label_list( mandatory = False, - cfg = apple_common.multi_arch_split, + cfg = transition_support.split_transition, doc = """Additional VFS for the framework to export """, @@ -1138,7 +1249,7 @@ The default behavior bakes this into the top level app. When false, it's statica "transitive_deps": attr.label_list( aspects = [swift_clang_module_aspect], mandatory = True, - cfg = apple_common.multi_arch_split, + cfg = transition_support.split_transition, doc = """Deps of the deps """, @@ -1183,7 +1294,7 @@ A list of framework targets (see [`ios_framework`](https://github.com/bazelbuild/rules_apple/blob/master/doc/rules-ios.md#ios_framework)) that this target depends on. """, - cfg = apple_common.multi_arch_split, + cfg = transition_support.split_transition, ), "_headermap_builder": attr.label( executable = True, @@ -1202,7 +1313,7 @@ that this target depends on. """, ), "_child_configuration_dummy": attr.label( - cfg = apple_common.multi_arch_split, + cfg = transition_support.split_transition, default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"), ), "bundle_id": attr.string( diff --git a/rules/framework/BUILD.bazel b/rules/framework/BUILD.bazel index 5db75a589..669e131c0 100644 --- a/rules/framework/BUILD.bazel +++ b/rules/framework/BUILD.bazel @@ -10,6 +10,7 @@ py_binary( bzl_library( name = "vfs_overlay", srcs = ["vfs_overlay.bzl"], + tags = ["manual"], visibility = ["//rules:__pkg__"], deps = [ "//rules:features", diff --git a/rules/import_middleman.bzl b/rules/import_middleman.bzl index 57b0dd3f3..72aa62386 100644 --- a/rules/import_middleman.bzl +++ b/rules/import_middleman.bzl @@ -4,6 +4,8 @@ # https://github.com/bazelbuild/rules_apple/commit/8d841342c238457896cd7596cc29b2d06c9a75f0 load("@build_bazel_rules_apple//apple:providers.bzl", "AppleFrameworkImportInfo") +load("@rules_apple_api//:providers.bzl", "new_appleframeworkimportinfo") +load("@rules_apple_api//:version.bzl", "apple_api_version") load("//rules:features.bzl", "feature_names") load("//rules/internal:objc_provider_utils.bzl", "objc_provider_utils") load("@build_bazel_rules_apple//apple/internal:bundling_support.bzl", "bundling_support") @@ -75,7 +77,7 @@ def _make_imports(transitive_sets): # TODO: consider passing along the dsyms provider_fields["dsym_imports"] = depset() - return [AppleFrameworkImportInfo(**provider_fields)] + return [new_appleframeworkimportinfo(**provider_fields)] def _find_imports_impl(target, ctx): static_framework_file = [] @@ -215,8 +217,7 @@ def _file_collector_rule_impl(ctx): deduped_static_framework = depset(_deduplicate_test_deps(test_linker_deps[0], existing_static_framework.to_list())) replaced_static_framework = _replace_inputs(ctx, deduped_static_framework, input_static_frameworks, _update_framework) - rules_apple_api_version = getattr(bundling_support, "rule_api_version", None) - use_lts_5_rules_apple_api = rules_apple_api_version == 1.0 + use_lts_5_rules_apple_api = apple_api_version == "1.0" if use_lts_5_rules_apple_api: objc_provider_fields["static_framework_file"] = depset(replaced_static_framework.inputs) else: @@ -231,10 +232,10 @@ def _file_collector_rule_impl(ctx): deduped_dynamic_framework = depset(_deduplicate_test_deps(test_linker_deps[2], exisiting_dynamic_framework.to_list())) dynamic_framework_file = [] dynamic_framework_dirs = [] - replaced_dyanmic_framework = {} + replaced_dynamic_framework = {} for f in input_dynamic_frameworks: out = _update_framework(ctx, f) - replaced_dyanmic_framework[f] = out + replaced_dynamic_framework[f] = out dynamic_framework_file.append(out) dynamic_framework_dirs.append(out) @@ -246,16 +247,16 @@ def _file_collector_rule_impl(ctx): dynamic_framework_dirs.extend(ad_hoc_file) for f in deduped_dynamic_framework.to_list(): - if not replaced_dyanmic_framework.get(f, False): + if not replaced_dynamic_framework.get(f, False): dynamic_framework_file.append(f) dynamic_framework_dirs.append(f) objc_provider_fields["dynamic_framework_file"] = depset(dynamic_framework_file) - all_replaced_frameworks = replaced_dyanmic_framework.values() + replaced_static_framework.replaced.values() + all_replaced_frameworks = replaced_dynamic_framework.values() + replaced_static_framework.replaced.values() if use_lts_5_rules_apple_api: replaced_frameworks = all_replaced_frameworks else: - replaced_frameworks = replaced_dyanmic_framework.values() + replaced_frameworks = replaced_dynamic_framework.values() compat_link_opt = ["-L__BAZEL_XCODE_DEVELOPER_DIR__/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator", "-Wl,-weak-lswiftCompatibility51"] diff --git a/rules/internal/BUILD.bazel b/rules/internal/BUILD.bazel index 7c6d1528d..622a29fc3 100644 --- a/rules/internal/BUILD.bazel +++ b/rules/internal/BUILD.bazel @@ -3,16 +3,22 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library") bzl_library( name = "objc_provider_utils", srcs = ["objc_provider_utils.bzl"], + tags = ["manual"], visibility = ["//rules:__pkg__"], ) bzl_library( name = "framework_middleman", srcs = ["framework_middleman.bzl"], + tags = ["manual"], visibility = ["//rules:__pkg__"], deps = [ ":objc_provider_utils", + "//rules:providers", + "//rules:transition_support", + "@bazel_skylib//lib:dicts", "@bazel_skylib//lib:partial", "@build_bazel_rules_apple//apple", + "@rules_apple_api//:api", ], ) diff --git a/rules/internal/framework_middleman.bzl b/rules/internal/framework_middleman.bzl index 7f8fd6f58..c2aa3c20d 100644 --- a/rules/internal/framework_middleman.bzl +++ b/rules/internal/framework_middleman.bzl @@ -1,10 +1,15 @@ load("@bazel_skylib//lib:partial.bzl", "partial") load( "@build_bazel_rules_apple//apple:providers.bzl", - "AppleBundleInfo", "AppleResourceInfo", "IosFrameworkBundleInfo", ) +load("@bazel_skylib//lib:dicts.bzl", "dicts") +load( + "@rules_apple_api//:providers.bzl", + "new_applebundleinfo", + "new_iosframeworkbundleinfo", +) load( "@build_bazel_rules_apple//apple/internal:partials.bzl", "partials", @@ -30,6 +35,7 @@ load( "//rules/internal:objc_provider_utils.bzl", "objc_provider_utils", ) +load("//rules:transition_support.bzl", "split_transition_rule_attrs", "transition_support") def _framework_middleman(ctx): resource_providers = [] @@ -81,8 +87,8 @@ def _framework_middleman(ctx): dynamic_framework_provider, cc_info_provider, objc_provider, - IosFrameworkBundleInfo(), - AppleBundleInfo( + new_iosframeworkbundleinfo(), + new_applebundleinfo( archive = None, archive_root = None, binary = None, @@ -118,9 +124,9 @@ def _framework_middleman(ctx): framework_middleman = rule( implementation = _framework_middleman, - attrs = { + attrs = dicts.add(split_transition_rule_attrs, { "framework_deps": attr.label_list( - cfg = apple_common.multi_arch_split, + cfg = transition_support.split_transition, mandatory = True, doc = """Deps that may contain frameworks @@ -150,7 +156,7 @@ framework_middleman = rule( """Internal - The product type of the framework """, ), - }, + }), doc = """ This is a volatile internal rule to make frameworks work with rules_apples bundling logic @@ -257,16 +263,16 @@ def _dep_middleman(ctx): dep_middleman = rule( implementation = _dep_middleman, - attrs = { + attrs = dicts.add(split_transition_rule_attrs, { "deps": attr.label_list( - cfg = apple_common.multi_arch_split, + cfg = transition_support.split_transition, mandatory = True, doc = """Deps that may contain frameworks """, ), "test_deps": attr.label_list( - cfg = apple_common.multi_arch_split, + cfg = transition_support.split_transition, allow_empty = True, ), "platform_type": attr.string( @@ -281,7 +287,7 @@ dep_middleman = rule( """Internal - currently rules_ios the dict `platforms` """, ), - }, + }), doc = """ This is a volatile internal rule to make frameworks work with rules_apples bundling logic diff --git a/rules/library.bzl b/rules/library.bzl index db84353a9..3d098c5a0 100644 --- a/rules/library.bzl +++ b/rules/library.bzl @@ -14,6 +14,7 @@ load("//rules/library:resources.bzl", "wrap_resources_in_filegroup") load("//rules/library:xcconfig.bzl", "copts_by_build_setting_with_defaults") load("//rules:import_middleman.bzl", "import_middleman") load("//rules:utils.bzl", "bundle_identifier_for_bundle") +load("@rules_apple_api//:version.bzl", "apple_api_version") PrivateHeadersInfo = provider( doc = "Propagates private headers, so they can be accessed if necessary", @@ -330,9 +331,13 @@ def _xcframework(*, library_name, name, slices): for arch in archs: if platform == "ios": - if (arch == "armv7s" or arch == "arm64e"): - # unsupported platform-arch by rules_apple + if apple_api_version == "3.0": + unsupported_platforms = ["armv7", "armv7s", "i386"] + else: + unsupported_platforms = ["armv7s", "arm64e"] + if arch in unsupported_platforms: continue + elif platform_variant == "maccatalyst": # TODO: support maccatalyst continue diff --git a/rules/library/BUILD.bazel b/rules/library/BUILD.bazel index 69d8263c0..084428783 100644 --- a/rules/library/BUILD.bazel +++ b/rules/library/BUILD.bazel @@ -8,6 +8,7 @@ exports_files([ bzl_library( name = "xcconfig", srcs = ["xcconfig.bzl"], + tags = ["manual"], visibility = ["//rules:__pkg__"], deps = [ "//data:xcspecs", @@ -20,5 +21,6 @@ bzl_library( bzl_library( name = "resources", srcs = ["resources.bzl"], + tags = ["manual"], visibility = ["//rules:__pkg__"], ) diff --git a/rules/module_extensions.bzl b/rules/module_extensions.bzl index 996ba804b..7b4901101 100644 --- a/rules/module_extensions.bzl +++ b/rules/module_extensions.bzl @@ -2,6 +2,7 @@ load( "//rules:repositories.bzl", + "rules_apple_api", "rules_ios_dependencies", "rules_ios_dev_dependencies", ) @@ -10,6 +11,14 @@ load( _xcode_configure = "xcode_configure", ) +def _rules_apple_api(_): + rules_apple_api( + name = "rules_apple_api", + version = "3_0", + ) + +rules_apple_api_deps = module_extension(implementation = _rules_apple_api) + def _non_module_deps_impl(_): rules_ios_dependencies( load_bzlmod_dependencies = False, diff --git a/rules/precompiled_apple_resource_bundle.bzl b/rules/precompiled_apple_resource_bundle.bzl index ae3e3420f..c91e96b20 100644 --- a/rules/precompiled_apple_resource_bundle.bzl +++ b/rules/precompiled_apple_resource_bundle.bzl @@ -6,6 +6,7 @@ https://github.com/bazelbuild/rules_apple/issues/319 if this is ever fixed in bazel it should be removed """ +load("@bazel_skylib//lib:dicts.bzl", "dicts") load("@bazel_skylib//lib:partial.bzl", "partial") load("@bazel_skylib//lib:paths.bzl", "paths") load("@build_bazel_apple_support//lib:apple_support.bzl", "apple_support") @@ -15,11 +16,12 @@ load("@build_bazel_rules_apple//apple/internal:partials.bzl", "partials") load("@build_bazel_rules_apple//apple/internal:platform_support.bzl", "platform_support") load("@build_bazel_rules_apple//apple/internal:resources.bzl", "resources") load("@build_bazel_rules_apple//apple/internal:resource_actions.bzl", "resource_actions") -load("@build_bazel_rules_apple//apple/internal:rule_factory.bzl", "rule_factory") +load("@rules_apple_api//:ios_rules.bzl", "rule_attrs") +load("@rules_apple_api//:providers.bzl", "new_appleresourcebundleinfo", "new_appleresourceinfo") load("@build_bazel_rules_apple//apple/internal:apple_toolchains.bzl", "AppleMacToolsToolchainInfo") -load("@build_bazel_rules_apple//apple:providers.bzl", "AppleResourceBundleInfo", "AppleResourceInfo") load("//rules:transition_support.bzl", "transition_support") load("//rules:utils.bzl", "bundle_identifier_for_bundle") +load("@rules_apple_api//:version.bzl", "apple_api_version") _FAKE_BUNDLE_PRODUCT_TYPE_BY_PLATFORM_TYPE = { "ios": apple_product_type.application, @@ -50,6 +52,15 @@ def _precompiled_apple_resource_bundle_impl(ctx): # passing a swift_module attr fake_rule_label = Label("//fake_package:" + (ctx.attr.swift_module or bundle_name)) + if apple_api_version == "3.0": + platform_prerequisites_version_args = { + "build_settings": None, + } + else: + platform_prerequisites_version_args = { + "disabled_features": ctx.disabled_features, + } + platform_prerequisites = platform_support.platform_prerequisites( apple_fragment = ctx.fragments.apple, config_vars = ctx.var, @@ -60,8 +71,8 @@ def _precompiled_apple_resource_bundle_impl(ctx): platform_type_string = platform_type, uses_swift = False, xcode_version_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig], - disabled_features = [], features = [], + **platform_prerequisites_version_args ) partials_args = dict( actions = ctx.actions, @@ -197,7 +208,7 @@ def _precompiled_apple_resource_bundle_impl(ctx): ) return [ - AppleResourceInfo( + new_appleresourceinfo( unowned_resources = depset(), owners = depset([ (output_bundle_dir.short_path, ctx.label), @@ -215,7 +226,7 @@ def _precompiled_apple_resource_bundle_impl(ctx): (output_bundle_dir.basename, None, depset([output_bundle_dir, output_plist])), ], ), - AppleResourceBundleInfo(), + new_appleresourcebundleinfo(), apple_common.new_objc_provider(), CcInfo(), ] @@ -224,9 +235,7 @@ _precompiled_apple_resource_bundle = rule( implementation = _precompiled_apple_resource_bundle_impl, fragments = ["apple"], cfg = transition_support.apple_rule_transition, - attrs = dict( - # This includes all the undocumented tool requirements for this rule - rule_factory.common_tool_attributes, + attrs = dicts.add(rule_attrs.common_tool_attrs(), dict( infoplists = attr.label_list( allow_files = [".plist"], default = [ @@ -287,7 +296,7 @@ the bundle as a dependency.""", default = Label("@build_bazel_rules_apple//apple/internal:mac_tools_toolchain"), providers = [[AppleMacToolsToolchainInfo]], ), - ), + )), ) def precompiled_apple_resource_bundle(**kwargs): diff --git a/rules/repositories.bzl b/rules/repositories.bzl index e900493f1..d19505e14 100644 --- a/rules/repositories.bzl +++ b/rules/repositories.bzl @@ -89,14 +89,36 @@ def rules_ios_dev_dependencies( _rules_ios_test_dependencies() +def _rules_apple_api_impl(ctx): + # Some of our third party deps from bazelbuild org don't support LTS but + # from time to time we'll evaluate supporting this to allow us to all run on + # HEAD and best interop with the rules_apple based dependencies. + # This simply symlinks the diretory rules/rules_apple_api/$vesrion onto "@rules_apple_api" where we import + # the interface. + base_path = str(ctx.path(ctx.attr.rules_ios).dirname) + path = base_path + "/rules/rules_apple_api/" + ctx.attr.version + ctx.symlink(path, "") + +rules_apple_api = repository_rule( + implementation = _rules_apple_api_impl, + attrs = { + "version": attr.string(), + "rules_ios": attr.label(default = "@build_bazel_rules_ios//:BUILD.bazel"), + }, + local = True, +) + def _rules_ios_bzlmod_dependencies(): - """ - Fetches repositories that are dependencies of `rules_ios` and available via bzlmod + """Fetches repositories that are dependencies of `rules_ios` These are only included when using WORKSPACE, when using bzlmod they're loaded in MODULE.bazel """ + bazel_version = _get_bazel_version() + if bazel_version.major == "5": + # For rules_apple 1.x, we maintained a tag rules_ios_1.0 - if _get_bazel_version().major == "5": + # Minimum commit vetted of rules_swift - not necessarily exclusive with + # this bazel version or rules_apple version but tested on CI as so. _maybe( github_repo, name = "build_bazel_rules_swift", @@ -105,11 +127,6 @@ def _rules_ios_bzlmod_dependencies(): repo = "rules_swift", sha256 = "006743d481c477928796ad985ba32b591f5926cd590d32b207e018049b569594", ) - - # LTS support. Some of our third party deps from bazelbuild org don't - # support LTS but from time to time we'll evaluate supporting this to - # allow us to all run on HEAD - # For rules_apple, we maintain a tag rules_ios_1.0 _maybe( github_repo, name = "build_bazel_rules_apple", @@ -118,30 +135,87 @@ def _rules_ios_bzlmod_dependencies(): repo = "rules_apple", sha256 = "1618fc82e556ebc97ea360b8cacd3365ca3b0e0a85ccb32422468204843e752d", ) - else: + _maybe( + rules_apple_api, + name = "rules_apple_api", + version = "1_0", + ) _maybe( http_archive, + name = "bazel_skylib", + urls = [ + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz", + ], + sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d", + ) + elif bazel_version.major == "6" and bazel_version.minor == "1": + _maybe( + github_repo, name = "build_bazel_rules_swift", - sha256 = "3a595a64afdcaf65b74b794661556318041466d727e175fa8ce20bdf1bb84ba0", - url = "https://github.com/bazelbuild/rules_swift/releases/download/1.10.0/rules_swift.1.10.0.tar.gz", + project = "bazelbuild", + ref = "17e20f7edf27e647f1b45f11ed75d51c17820c3b", + repo = "rules_swift", + sha256 = "d50c2cb6f1c2c30cf44a8ea60469cd399f7458061169bde76a177b63d6b74330", ) - _maybe( - http_archive, + github_repo, name = "build_bazel_rules_apple", - sha256 = "8ac4c7997d863f3c4347ba996e831b5ec8f7af885ee8d4fe36f1c3c8f0092b2c", - url = "https://github.com/bazelbuild/rules_apple/releases/download/2.5.0/rules_apple.2.5.0.tar.gz", + ref = "915ac30a9fa1fd3809599a5ab90fa1c6640fe8dc", + project = "bazelbuild", + repo = "rules_apple", + sha256 = "0204016496a39d5c70247650e098905d129f25347c7e1f019f838ca74252ce2d", + ) + _maybe( + rules_apple_api, + name = "rules_apple_api", + version = "2_0", + ) + _maybe( + http_archive, + name = "bazel_skylib", + urls = [ + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz", + ], + sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d", ) - _maybe( - http_archive, - name = "bazel_skylib", - sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz", - ], - ) + else: + # Bazel 6+ codepath - you can use the 2_x version of rules_apple here if + # you'd like to set it. If you want to use a different rules_apple than + # we have here - define rules_apple_api - to the value you'd like + _maybe( + github_repo, + name = "build_bazel_rules_swift", + project = "bazelbuild", + ref = "267512835d70610865aa00300d317c3ef1e1f8bf", + repo = "rules_swift", + sha256 = "4fdeb69da7a40155b2e10f431a6624bd767fb8983effba630cf12b7f34d24c83", + ) + + _maybe( + github_repo, + name = "build_bazel_rules_apple", + ref = "55cf5c2bec04b05b9ab435e24174834c5681be12", + project = "bazelbuild", + repo = "rules_apple", + sha256 = "11422f86bf0dd6503b8b6b3eb0e9ab29e8c84db15ca38ea000935d1d020107e0", + ) + _maybe( + rules_apple_api, + name = "rules_apple_api", + version = "3_0", + ) + _maybe( + http_archive, + name = "bazel_skylib", + sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz", + ], + ) _maybe( http_archive, diff --git a/rules/rules_apple_api/1_0/BUILD.bazel b/rules/rules_apple_api/1_0/BUILD.bazel new file mode 100644 index 000000000..40278e4b2 --- /dev/null +++ b/rules/rules_apple_api/1_0/BUILD.bazel @@ -0,0 +1,12 @@ +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") + +bzl_library( + name = "api", + srcs = [ + "ios_rules.bzl", + "providers.bzl", + "version.bzl", + ], + tags = ["manual"], + visibility = ["//visibility:public"], +) diff --git a/rules/rules_apple_api/1_0/WORKSPACE b/rules/rules_apple_api/1_0/WORKSPACE new file mode 100644 index 000000000..e69de29bb diff --git a/rules/rules_apple_api/1_0/ios_rules.bzl b/rules/rules_apple_api/1_0/ios_rules.bzl new file mode 120000 index 000000000..a2b61c377 --- /dev/null +++ b/rules/rules_apple_api/1_0/ios_rules.bzl @@ -0,0 +1 @@ +../2_0/ios_rules.bzl \ No newline at end of file diff --git a/rules/rules_apple_api/1_0/providers.bzl b/rules/rules_apple_api/1_0/providers.bzl new file mode 120000 index 000000000..c3e2c81e0 --- /dev/null +++ b/rules/rules_apple_api/1_0/providers.bzl @@ -0,0 +1 @@ +../2_0/providers.bzl \ No newline at end of file diff --git a/rules/rules_apple_api/1_0/version.bzl b/rules/rules_apple_api/1_0/version.bzl new file mode 100755 index 000000000..25fea8800 --- /dev/null +++ b/rules/rules_apple_api/1_0/version.bzl @@ -0,0 +1 @@ +apple_api_version = "1.0" diff --git a/rules/rules_apple_api/2_0/BUILD.bazel b/rules/rules_apple_api/2_0/BUILD.bazel new file mode 100644 index 000000000..40278e4b2 --- /dev/null +++ b/rules/rules_apple_api/2_0/BUILD.bazel @@ -0,0 +1,12 @@ +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") + +bzl_library( + name = "api", + srcs = [ + "ios_rules.bzl", + "providers.bzl", + "version.bzl", + ], + tags = ["manual"], + visibility = ["//visibility:public"], +) diff --git a/rules/rules_apple_api/2_0/WORKSPACE b/rules/rules_apple_api/2_0/WORKSPACE new file mode 100755 index 000000000..e69de29bb diff --git a/rules/rules_apple_api/2_0/ios_rules.bzl b/rules/rules_apple_api/2_0/ios_rules.bzl new file mode 100644 index 000000000..2c0dcffe8 --- /dev/null +++ b/rules/rules_apple_api/2_0/ios_rules.bzl @@ -0,0 +1,7 @@ +load("@build_bazel_rules_apple//apple/internal:rule_factory.bzl", "rule_factory") + +#load("@build_bazel_rules_apple//apple/internal:providers.bzl", "new_appleresourcebundleinfo", "new_appleresourceinfo") +def _common_tool_attrs(): + return rule_factory.common_tool_attributes + +rule_attrs = struct(common_tool_attrs = _common_tool_attrs) diff --git a/rules/rules_apple_api/2_0/providers.bzl b/rules/rules_apple_api/2_0/providers.bzl new file mode 100644 index 000000000..28fdd9d3a --- /dev/null +++ b/rules/rules_apple_api/2_0/providers.bzl @@ -0,0 +1,14 @@ +load( + "@build_bazel_rules_apple//apple:providers.bzl", + _AppleBundleInfo = "AppleBundleInfo", + _AppleFrameworkImportInfo = "AppleFrameworkImportInfo", + _AppleResourceBundleInfo = "AppleResourceBundleInfo", + _AppleResourceInfo = "AppleResourceInfo", + _IosFrameworkBundleInfo = "IosFrameworkBundleInfo", +) + +new_appleresourcebundleinfo = _AppleResourceBundleInfo +new_applebundleinfo = _AppleBundleInfo +new_appleresourceinfo = _AppleResourceInfo +new_iosframeworkbundleinfo = _IosFrameworkBundleInfo +new_appleframeworkimportinfo = _AppleFrameworkImportInfo diff --git a/rules/rules_apple_api/2_0/version.bzl b/rules/rules_apple_api/2_0/version.bzl new file mode 100755 index 000000000..0ea0e92b1 --- /dev/null +++ b/rules/rules_apple_api/2_0/version.bzl @@ -0,0 +1 @@ +apple_api_version = "2.0" diff --git a/rules/rules_apple_api/3_0/BUILD.bazel b/rules/rules_apple_api/3_0/BUILD.bazel new file mode 100644 index 000000000..1faaf2fb8 --- /dev/null +++ b/rules/rules_apple_api/3_0/BUILD.bazel @@ -0,0 +1,16 @@ +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") + +bzl_library( + name = "api", + srcs = [ + "ios_rules.bzl", + "providers.bzl", + "version.bzl", + ], + tags = ["manual"], + visibility = ["//visibility:public"], + deps = [ + "@build_bazel_apple_support//lib:apple_support", + "@build_bazel_rules_apple//apple", + ], +) diff --git a/rules/rules_apple_api/3_0/WORKSPACE b/rules/rules_apple_api/3_0/WORKSPACE new file mode 100644 index 000000000..83a96af0a --- /dev/null +++ b/rules/rules_apple_api/3_0/WORKSPACE @@ -0,0 +1,2 @@ +# DO NOT EDIT: automatically generated WORKSPACE file for rules_apple_api rule +workspace(name = "rules_apple_api") diff --git a/rules/rules_apple_api/3_0/ios_rules.bzl b/rules/rules_apple_api/3_0/ios_rules.bzl new file mode 100644 index 000000000..43a1b6106 --- /dev/null +++ b/rules/rules_apple_api/3_0/ios_rules.bzl @@ -0,0 +1,3 @@ +load("@build_bazel_rules_apple//apple/internal:rule_attrs.bzl", _rule_attrs = "rule_attrs") + +rule_attrs = _rule_attrs diff --git a/rules/rules_apple_api/3_0/providers.bzl b/rules/rules_apple_api/3_0/providers.bzl new file mode 100644 index 000000000..6dad1f045 --- /dev/null +++ b/rules/rules_apple_api/3_0/providers.bzl @@ -0,0 +1,14 @@ +load( + "@build_bazel_rules_apple//apple/internal:providers.bzl", + _new_applebundleinfo = "new_applebundleinfo", + _new_appleframeworkimportinfo = "new_appleframeworkimportinfo", + _new_appleresourcebundleinfo = "new_appleresourcebundleinfo", + _new_appleresourceinfo = "new_appleresourceinfo", + _new_iosframeworkbundleinfo = "new_iosframeworkbundleinfo", +) + +new_applebundleinfo = _new_applebundleinfo +new_appleframeworkimportinfo = _new_appleframeworkimportinfo +new_appleresourcebundleinfo = _new_appleresourcebundleinfo +new_appleresourceinfo = _new_appleresourceinfo +new_iosframeworkbundleinfo = _new_iosframeworkbundleinfo diff --git a/rules/rules_apple_api/3_0/version.bzl b/rules/rules_apple_api/3_0/version.bzl new file mode 100755 index 000000000..ab5844197 --- /dev/null +++ b/rules/rules_apple_api/3_0/version.bzl @@ -0,0 +1 @@ +apple_api_version = "3.0" diff --git a/rules/test.bzl b/rules/test.bzl index b3d624e5d..6ac0b12bf 100644 --- a/rules/test.bzl +++ b/rules/test.bzl @@ -3,6 +3,7 @@ load("@bazel_skylib//lib:types.bzl", "types") load("//rules:library.bzl", "apple_library") load("//rules:plists.bzl", "process_infoplists") load("//rules/internal:framework_middleman.bzl", "dep_middleman", "framework_middleman") +load("@rules_apple_api//:version.bzl", "apple_api_version") _IOS_TEST_KWARGS = [ "args", @@ -103,6 +104,9 @@ def _make_test(name, test_rule, **kwargs): """ runner = kwargs.pop("runner", None) or _DEFAULT_APPLE_TEST_RUNNER test_attrs = {k: v for (k, v) in kwargs.items() if k not in _APPLE_BUNDLE_ATTRS} + if apple_api_version == "3.0": + test_attrs["minimum_os_version"] = kwargs.pop("minimum_os_version") + test_rule( name = name, runner = runner, @@ -187,11 +191,26 @@ def _ios_test(name, bundle_rule, test_rule, test_factory, apple_library, infopli # Setup framework middlemen - need to process deps and libs fw_name = name + ".framework_middleman" - framework_middleman(name = fw_name, framework_deps = kwargs.get("deps", []) + library.lib_names, testonly = testonly, tags = ["manual"]) + framework_middleman( + name = fw_name, + framework_deps = kwargs.get("deps", []) + library.lib_names, + testonly = testonly, + tags = ["manual"], + platform_type = "ios", + minimum_os_version = ios_test_kwargs.get("minimum_os_version"), + ) frameworks = [fw_name] + ios_test_kwargs.pop("frameworks", []) dep_name = name + ".dep_middleman" - dep_middleman(name = dep_name, deps = kwargs.get("deps", []) + library.lib_names, testonly = testonly, tags = ["manual"], test_deps = host_args) + dep_middleman( + name = dep_name, + deps = kwargs.get("deps", []) + library.lib_names, + testonly = testonly, + tags = ["manual"], + test_deps = host_args, + platform_type = "ios", + minimum_os_version = ios_test_kwargs.get("minimum_os_version"), + ) infoplists = process_infoplists( name = name, diff --git a/rules/test/lldb/BUILD.bazel b/rules/test/lldb/BUILD.bazel index c1dd84e18..f78eae0b3 100644 --- a/rules/test/lldb/BUILD.bazel +++ b/rules/test/lldb/BUILD.bazel @@ -19,7 +19,7 @@ py_library( # Wrap this to feed into py_library - doesn't like the name with the dot in it genrule( name = "sim_template", - srcs = ["@build_bazel_rules_apple//apple/internal/templates:ios_sim_template"], + srcs = ["@build_bazel_rules_apple//apple/internal/templates:apple_simulator_template"], outs = ["sim_template.py"], cmd = "cp $(SRCS) $(OUTS)", ) diff --git a/rules/transition_support.bzl b/rules/transition_support.bzl index f2bf56835..e6fe1b888 100644 --- a/rules/transition_support.bzl +++ b/rules/transition_support.bzl @@ -1,5 +1,7 @@ """Starlark transition support for Apple rules.""" +load("@rules_apple_api//:version.bzl", "apple_api_version") + def _current_apple_platform(apple_fragment, xcode_config): """Returns a struct containing the platform and target os version""" platform = apple_fragment.single_arch_platform @@ -12,7 +14,7 @@ def _current_apple_platform(apple_fragment, xcode_config): target_os_version = target_os_version, ) -def _cpu_string(platform_type, settings): +def _cpu_string(environment_arch, platform_type, settings): """Generates a _ string for the current target based on the given parameters.""" # If the cpu value has already been transformed to the correct value, we must not change it anymore. @@ -22,6 +24,8 @@ def _cpu_string(platform_type, settings): return cpu_value if platform_type == "ios": + if environment_arch: + return "ios_{}".format(environment_arch) ios_cpus = settings["//command_line_option:ios_multi_cpus"] if ios_cpus: return "ios_%s" % ios_cpus[0] @@ -30,20 +34,33 @@ def _cpu_string(platform_type, settings): else: return "ios_x86_64" if platform_type == "macos": + if environment_arch: + return "darwin_{}".format(environment_arch) macos_cpus = settings["//command_line_option:macos_cpus"] if macos_cpus: return "darwin_%s" % macos_cpus[0] return "darwin_x86_64" if platform_type == "tvos": + if environment_arch: + return "tvos_{}".format(environment_arch) tvos_cpus = settings["//command_line_option:tvos_cpus"] if tvos_cpus: return "tvos_%s" % tvos_cpus[0] return "tvos_x86_64" + if platform_type == "visionos": + if environment_arch: + return "visionos_{}".format(environment_arch) + visionos_cpus = settings["//command_line_option:visionos_cpus"] + if visionos_cpus: + return "visionos_{}".format(visionos_cpus[0]) + return "visionos_x86_64" if platform_type == "watchos": + if environment_arch: + return "watchos_{}".format(environment_arch) watchos_cpus = settings["//command_line_option:watchos_cpus"] if watchos_cpus: - return "watchos_%s" % watchos_cpus[0] - return "watchos_i386" + return "watchos_{}".format(watchos_cpus[0]) + return "watchos_x86_64" fail("ERROR: Unknown platform type: %s" % platform_type) @@ -52,12 +69,12 @@ def _min_os_version_or_none(attr, attr_platforms, platform, attr_platform_type): return None if attr_platforms != None: - return attr_platforms[platform] if platform in attr_platforms else None + return attr_platforms[platform] if (platform in attr_platforms and attr_platforms[platform] != "") else None if hasattr(attr, "minimum_os_version"): - return attr.minimum_os_version + return attr.minimum_os_version if attr.minimum_os_version != "" else None - fail("ERROR: must either specify a single platform/minimum_os_version, or specify a dict via platforms") + return None def _apple_rule_transition_impl(settings, attr): """Rule transition for Apple rules.""" @@ -75,12 +92,11 @@ def _apple_rule_transition_impl(settings, attr): fail("ERROR: {}: attribute platforms set to {}, but platform inferred to be {}".format(attr.name, attr_platforms, platform_type)) platform_type = attr_platforms.keys()[0] - cpu_string = _cpu_string(platform_type, settings) + cpu_string = _cpu_string(None, platform_type, settings) # Transition ios_multi_cpus to to a single cpu when building for iOS. # Rules using this transition (e.g., apple_framework_packaging, precompiled_apple_resource_bundle) don't need any artifacts from other archs. ios_multi_cpus = cpu_string[4:] if platform_type == "ios" else settings["//command_line_option:ios_multi_cpus"] - ret = { "//command_line_option:apple configuration distinguisher": "applebin_" + platform_type, "//command_line_option:apple_platform_type": platform_type, @@ -100,6 +116,8 @@ def _apple_rule_transition_impl(settings, attr): } return ret +_supports_visionos = hasattr(apple_common.platform_type, "visionos") + # These flags are a mix of options defined in native Bazel from the following fragments: # - https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java # - https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java @@ -117,7 +135,8 @@ _apple_rule_transition = transition( "//command_line_option:tvos_cpus", "//command_line_option:watchos_cpus", "//command_line_option:apple_split_cpu", - ], + "//command_line_option:macos_minimum_os", + ] + (["//command_line_option:visionos_cpus"] if _supports_visionos else []), outputs = [ "//command_line_option:apple configuration distinguisher", "//command_line_option:apple_platform_type", @@ -135,7 +154,188 @@ _apple_rule_transition = transition( ], ) +def _is_arch_supported_for_target_tuple(*, environment_arch, minimum_os_version, platform_type): + """Indicates if the environment_arch selected is supported for the given platform and min os.""" + if minimum_os_version == "": + return True + dotted_minimum_os_version = apple_common.dotted_version(minimum_os_version) + if (environment_arch == "armv7k" and platform_type == "watchos" and + dotted_minimum_os_version >= apple_common.dotted_version("9.0")): + return False + return True + +_PLATFORM_TYPE_TO_CPUS_FLAG = { + "ios": "//command_line_option:ios_multi_cpus", + "macos": "//command_line_option:macos_cpus", + "tvos": "//command_line_option:tvos_cpus", + "visionos": "//command_line_option:visionos_cpus", + "watchos": "//command_line_option:watchos_cpus", +} + +def _platform_specific_cpu_setting_name(platform_type): + """Returns the name of a platform-specific CPU setting.""" + flag = _PLATFORM_TYPE_TO_CPUS_FLAG.get(platform_type, None) + if not flag: + fail("ERROR: Unknown platform type: {}".format(platform_type)) + return flag + +def _environment_archs(platform_type, settings): + """Returns a full set of environment archs from the incoming command line options.""" + environment_archs = settings[_platform_specific_cpu_setting_name(platform_type)] + if not environment_archs: + if platform_type == "ios": + # Legacy exception to interpret the --cpu as an iOS arch. + cpu_value = settings["//command_line_option:cpu"] + if cpu_value.startswith("ios_"): + environment_archs = [cpu_value[4:]] + if not environment_archs: + environment_archs = [ + _cpu_string( + environment_arch = None, + platform_type = platform_type, + settings = settings, + ).split("_", 1)[1], + ] + return environment_archs + +def _split_transition_impl(settings, attr): + """Basic split transition for Apple platform-aware rules. + + This has to interop with the other rules and transitions to ensure we have + matching settings.""" + + split_output_dictionary = {} + invalid_requested_archs = [] + emit_swiftinterface = hasattr(attr, "_emitswiftinterface") + platform_type = attr.platform_type + + # Insert platform types based on the CPU + if platform_type == "": + cpu = settings["//command_line_option:cpu"] + if cpu.startswith("ios"): + platform_type = "ios" + elif cpu.startswith("tvos"): + platform_type = "tvos" + elif cpu.startswith("watchos"): + platform_type = "watchos" + elif cpu.startswith("visionos"): + platform_type = "visionos" + else: + platform_type = "macos" + + for environment_arch in _environment_archs(platform_type, settings): + found_cpu = _cpu_string( + environment_arch = environment_arch, + platform_type = platform_type, + settings = settings, + ) + if found_cpu in split_output_dictionary: + continue + + minimum_os_version = attr.minimum_os_version + environment_arch_is_supported = _is_arch_supported_for_target_tuple( + environment_arch = environment_arch, + minimum_os_version = minimum_os_version, + platform_type = platform_type, + ) + if not environment_arch_is_supported: + invalid_requested_arch = { + "environment_arch": environment_arch, + "minimum_os_version": minimum_os_version, + "platform_type": platform_type, + } + invalid_requested_archs.append(invalid_requested_arch) + continue + + cpu_string = _cpu_string(environment_arch, platform_type, settings) + ios_multi_cpus = cpu_string[4:] if platform_type == "ios" else settings["//command_line_option:ios_multi_cpus"] + attr_platforms = getattr(attr, "platforms", None) + output_dictionary = { + "//command_line_option:apple configuration distinguisher": "applebin_" + platform_type, + "//command_line_option:apple_platform_type": platform_type, + "//command_line_option:apple_split_cpu": environment_arch if (environment_arch and environment_arch != "") else None, + "//command_line_option:compiler": None, + "//command_line_option:cpu": _cpu_string( + environment_arch = None, + platform_type = platform_type, + settings = settings, + ), + "//command_line_option:crosstool_top": ( + settings["//command_line_option:apple_crosstool_top"] + ), + "//command_line_option:fission": [], + "//command_line_option:grte_top": None, + "//command_line_option:ios_minimum_os": _min_os_version_or_none(attr, attr_platforms, "ios", platform_type), + "//command_line_option:ios_multi_cpus": ios_multi_cpus, + "//command_line_option:macos_minimum_os": _min_os_version_or_none(attr, attr_platforms, "macos", platform_type), + "//command_line_option:tvos_minimum_os": _min_os_version_or_none(attr, attr_platforms, "tvos", platform_type), + "//command_line_option:watchos_minimum_os": _min_os_version_or_none(attr, attr_platforms, "watchos", platform_type), + "//command_line_option:minimum_os_version": minimum_os_version, + } + output_dictionary["@build_bazel_rules_swift//swift:emit_swiftinterface"] = emit_swiftinterface + split_output_dictionary[found_cpu] = output_dictionary + + if not bool(split_output_dictionary): + error_msg = "Could not find any valid architectures to build for the current target.\n\n" + if invalid_requested_archs: + error_msg += "Requested the following invalid architectures:\n" + for invalid_requested_arch in invalid_requested_archs: + error_msg += ( + " - {environment_arch} for {platform_type} {minimum_os_version}\n".format( + **invalid_requested_arch + ) + ) + error_msg += ( + "\nPlease check that the specified architectures are valid for the target's " + + "specified minimum_os_version.\n" + ) + fail(error_msg) + return split_output_dictionary + +_split_transition = transition( + implementation = _split_transition_impl, + inputs = [ + "//command_line_option:apple_platforms", + "//command_line_option:platforms", + "//command_line_option:cpu", + "//command_line_option:apple_crosstool_top", + "//command_line_option:ios_multi_cpus", + "//command_line_option:macos_cpus", + "//command_line_option:tvos_cpus", + "//command_line_option:watchos_cpus", + "//command_line_option:minimum_os_version", + ] + (["//command_line_option:visionos_cpus"] if _supports_visionos else []), + outputs = [ + "//command_line_option:apple configuration distinguisher", + "//command_line_option:apple_platform_type", + "//command_line_option:apple_split_cpu", + "//command_line_option:compiler", + "//command_line_option:cpu", + "//command_line_option:crosstool_top", + "//command_line_option:fission", + "//command_line_option:grte_top", + "//command_line_option:ios_minimum_os", + "//command_line_option:macos_minimum_os", + "//command_line_option:ios_multi_cpus", + "//command_line_option:minimum_os_version", + "//command_line_option:tvos_minimum_os", + "//command_line_option:watchos_minimum_os", + "@build_bazel_rules_swift//swift:emit_swiftinterface", + ], +) + transition_support = struct( apple_rule_transition = _apple_rule_transition, + + # In older versions of rules_apple and Bazel this is a starlark transiton + split_transition = _split_transition if apple_api_version == "3.0" else apple_common.multi_arch_split, current_apple_platform = _current_apple_platform, ) + +# For the above comment +split_transition_rule_attrs = { + "_allowlist_function_transition": attr.label( + default = "@bazel_tools//tools/allowlists/function_transition_allowlist", + doc = "Needed to allow this rule to have an incoming edge configuration transition.", + ), +} if apple_api_version == "3.0" else {} diff --git a/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj index c6f2bd607..a9f3e70cd 100755 --- a/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Single-Static-Framework-Project.xcodeproj/project.pbxproj @@ -300,7 +300,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -320,9 +320,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -342,7 +342,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -365,7 +365,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -390,7 +390,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -450,9 +450,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -474,7 +474,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -532,7 +532,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -593,9 +593,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -655,7 +655,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -675,7 +675,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -698,9 +698,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFramework\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFramework\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/objc/ObjcFrameworkTestLib_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-BuildForDevice-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-BuildForDevice-Project.xcodeproj/project.pbxproj index 05fcb4185..d18bffb4f 100755 --- a/tests/ios/xcodeproj/Test-BuildForDevice-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-BuildForDevice-Project.xcodeproj/project.pbxproj @@ -392,7 +392,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -414,7 +414,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -436,7 +436,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -456,7 +456,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -481,9 +481,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -503,7 +503,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -564,9 +564,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -588,7 +588,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-65c06fec92bf/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-arm64-min10.0-applebin_ios-ios_arm64-dbg-ST-38368eb0f253/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj index 4e7fb3630..737176469 100755 --- a/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-Imports-App-Project.xcodeproj/project.pbxproj @@ -355,10 +355,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-2a586287bf70/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-2a586287bf70/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -379,10 +379,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -404,10 +404,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -429,10 +429,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-2a586287bf70/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-2a586287bf70/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; diff --git a/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj index 47cc66b12..4428b5cf3 100755 --- a/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj @@ -184,7 +184,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -242,7 +242,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj index 8a8e79771..f5fc00222 100755 --- a/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-Mixed-Dynamic-App-Project.xcodeproj/project.pbxproj @@ -401,12 +401,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/b.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/b/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; @@ -462,12 +462,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/aWithResourceBundles.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; @@ -488,7 +488,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -510,12 +510,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/a.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; @@ -536,7 +536,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/a\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -558,12 +558,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/a.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/a.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/a.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/a.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/a_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; @@ -617,12 +617,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/b.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/b/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; @@ -640,12 +640,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/c.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -662,12 +662,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/aWithResourceBundles.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/b/b\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/a/aWithResourceBundles_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ../../../tests/ios/frameworks/dynamic/a/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = "$(inherited)"; @@ -685,12 +685,12 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/c.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/frameworks/dynamic/c/c_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj index edf8a5034..cdd7e461d 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project-WithTransitiveFlag.xcodeproj/project.pbxproj @@ -406,9 +406,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -455,7 +455,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -477,7 +477,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -537,7 +537,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -582,7 +582,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -607,9 +607,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -629,7 +629,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -656,7 +656,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj index 5e7c4e315..eb0790172 100755 --- a/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-MultipleConfigs-Project.xcodeproj/project.pbxproj @@ -350,7 +350,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -375,7 +375,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -490,7 +490,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -548,7 +548,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -568,9 +568,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -590,9 +590,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj index 7bf181c6a..c82bb3469 100755 --- a/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/Test-With-Host-App-With-AdditionalPrebuildScript.xcodeproj/project.pbxproj @@ -503,7 +503,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -523,7 +523,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -550,7 +550,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -631,7 +631,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -658,7 +658,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -718,7 +718,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -738,9 +738,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -760,9 +760,9 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj index 175cd7dd9..bc19a2d1d 100755 --- a/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/TestWithHostApp.xcodeproj/project.pbxproj @@ -452,7 +452,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -515,7 +515,7 @@ BAZEL_SWIFTMODULEFILES_TO_COPY = ""; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/OnlySources\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW2\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/OnlySources\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -537,7 +537,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHostedWithAppExtensions.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -647,7 +647,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHostedWithAppExtensions.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHostedWithAppExtensions.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -696,7 +696,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHosted.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -720,7 +720,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/ExplicitHosted.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHosted.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHosted.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/ExplicitHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; diff --git a/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj b/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj index 3bb4935c9..ca1d7f071 100755 --- a/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj +++ b/tests/ios/xcodeproj/custom_output_path/Test-LLDB-Logs-Project.xcodeproj/project.pbxproj @@ -184,7 +184,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; @@ -242,7 +242,7 @@ CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-d31cf6d5fbab/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; + HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_public_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/app/FW_private_hmap.hmap\" \"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 10.0; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = YES; diff --git a/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj index ad075e4da..544da9aac 100755 --- a/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Single-Application-Project-AllTargets.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -419,7 +419,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -442,7 +442,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -465,7 +465,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; diff --git a/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj index 5dc679e18..284d26ffd 100755 --- a/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Single-Application-Project-DirectTargetsOnly.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -295,7 +295,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -404,7 +404,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-RunnableTestSuite.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_RunnableTestSuite.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -465,7 +465,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/Single-Application-UnitTests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = "-D'REQUIRED_DEFINED_FLAG=1' -D'FLAG_WITH_VALUE_ZERO=0'"; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-103f2e67c6d8/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftmodule bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftdoc bazel-out/ios-x86_64-min11.0-applebin_ios-ios_x86_64-dbg-ST-cc0765bdd06d/bin/tests/macos/xcodeproj/Single_Application_UnitTests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; diff --git a/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj b/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj index 70d170352..b17494d8c 100755 --- a/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj +++ b/tests/macos/xcodeproj/Test-Target-With-Test-Host-Project.xcodeproj/project.pbxproj @@ -414,10 +414,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-2a586287bf70/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-2a586287bf70/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -438,7 +438,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/DefaultHosted_bundle.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-65c06fec92bf/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-65c06fec92bf/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-65c06fec92bf/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; @@ -462,10 +462,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -487,10 +487,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-Unit-Tests.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_Unit_Tests.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-2a586287bf70/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports-App_framework_unlinked\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-2a586287bf70/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\" \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -511,10 +511,10 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = "$CONFIGURATION_TEMP_DIR/TestImports-App.lldbinit"; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-41567f1bc2e5/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftmodule bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftdoc bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/TestImports_App.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-11376cdf8928/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks \"$BAZEL_WORKSPACE_ROOT/external/GoogleMobileAdsSDK/Frameworks/GoogleMobileAdsFramework-Current/GoogleMobileAds.xcframework/ios-arm64_x86_64-simulator\" \"$BAZEL_WORKSPACE_ROOT/external/TensorFlowLiteC/Frameworks\" \"$BAZEL_WORKSPACE_ROOT/bazel-out/ios-x86_64-min12.0-applebin_ios-ios_x86_64-dbg-ST-43ce1e61d7d2/bin/tests/ios/unit-test/test-imports-app/SomeFramework\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Basic/ios\" \"$BAZEL_WORKSPACE_ROOT/tests/ios/unit-test/test-imports-app/frameworks/Nested/ios\""; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = "\"$BAZEL_WORKSPACE_ROOT\""; INFOPLIST_FILE = ""; @@ -660,7 +660,7 @@ BAZEL_BUILD_TARGET_WORKSPACE = build_bazel_rules_ios; BAZEL_LLDB_INIT_FILE = $CONFIGURATION_TEMP_DIR/DefaultHosted_bundle.lldbinit; BAZEL_LLDB_SWIFT_EXTRA_CLANG_FLAGS = ""; - BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-65c06fec92bf/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-65c06fec92bf/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-65c06fec92bf/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; + BAZEL_SWIFTMODULEFILES_TO_COPY = "bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/unit-test/DefaultHosted.swiftmodule bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/unit-test/DefaultHosted.swiftdoc bazel-out/ios-x86_64-min10.0-applebin_ios-ios_x86_64-dbg-ST-3e1e434faca9/bin/tests/ios/unit-test/DefaultHosted.swiftsourceinfo"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; diff --git a/tools/vmd/vm_test_runner.bzl b/tools/vmd/vm_test_runner.bzl index a56f2db15..43f12a4bd 100644 --- a/tools/vmd/vm_test_runner.bzl +++ b/tools/vmd/vm_test_runner.bzl @@ -19,7 +19,7 @@ """iOS test runner rule.""" load( - "@build_bazel_rules_apple//apple/testing:apple_test_rules.bzl", + "@build_bazel_rules_apple//apple:providers.bzl", "AppleTestRunnerInfo", )