Fix more tests

Author: adincebic

apple/internal/apple_archive.bzl

@@ -151,15 +151,15 @@ def _create_archive_file(ctx, bundle_info, bundletool, should_compress, all_inpu
         bundle_info: The AppleBundleInfo provider.
         bundletool: The bundletool executable.
         should_compress: Whether to compress the archive.
-        all_inputs: Tuple of (bundle_merge_files, symbols_inputs, swift_support_inputs,
-                    watchos_stub_inputs, messages_stub_inputs).
+        all_inputs: Tuple of (bundle_merge_files, symbols_inputs,
+                    swift_support_inputs, watchos_stub_inputs, messages_stub_inputs).
 
     Returns:
         The declared archive file.
     """
     bundle_merge_files, symbols_inputs, swift_support_inputs, watchos_stub_inputs, messages_stub_inputs = all_inputs
 
-    archive = ctx.actions.declare_file("%s.ipa" % bundle_info.bundle_name)
+    archive = ctx.actions.declare_file("%s.ipa" % ctx.attr.bundle.label.name)
 
     control = struct(
         bundle_merge_files = bundle_merge_files,
@@ -266,6 +266,7 @@ def _apple_archive_impl(ctx):
 
     should_compress = _should_compress_archive(ctx)
 
+    # Package the bundle tree artifact into an IPA
     bundle_merge_files = [
         struct(
             src = bundle_info.archive.path,

apple/internal/experimental.bzl

@@ -49,10 +49,10 @@ def is_experimental_tree_artifact_enabled(
     # These will produce .app bundles that can be wrapped into .ipa files
     if rule_descriptor and platform_prerequisites:
         if (platform_prerequisites.platform.platform_type, rule_descriptor.product_type) in [
-            (str(apple_common.platform_type.ios), apple_product_type.application),
-            (str(apple_common.platform_type.ios), apple_product_type.messages_application),
-            (str(apple_common.platform_type.tvos), apple_product_type.application),
-            (str(apple_common.platform_type.visionos), apple_product_type.application),
+            (apple_common.platform_type.ios, apple_product_type.application),
+            (apple_common.platform_type.ios, apple_product_type.messages_application),
+            (apple_common.platform_type.tvos, apple_product_type.application),
+            (apple_common.platform_type.visionos, apple_product_type.application),
         ]:
             return True
 

test/ios_application_swift_test.sh

@@ -32,6 +32,7 @@ function tear_down() {
 # individual tests (so that they can exercise different dependency structures).
 function create_minimal_ios_application() {
   cat > app/BUILD <<EOF
+load("@build_bazel_rules_apple//apple:apple_archive.bzl", "apple_archive")
 load("@build_bazel_rules_apple//apple:ios.bzl",
      "ios_application")
 load("@build_bazel_rules_swift//swift:swift.bzl",
@@ -46,6 +47,11 @@ ios_application(
     provisioning_profile = "@build_bazel_rules_apple//test/testdata/provisioning:integration_testing_ios.mobileprovision",
     deps = [":lib"],
 )
+
+apple_archive(
+    name = "ipa_app",
+    bundle = ":app",
+)
 EOF
 
   cat > app/AppDelegate.swift <<EOF
@@ -96,7 +102,7 @@ swift_library(
 )
 EOF
 
-  do_build ios //app:app || fail "Should build"
+  do_build ios //app:ipa_app || fail "Should build"
   assert_ipa_contains_swift_dylibs_for_device
 }
 
@@ -113,7 +119,7 @@ swift_library(
 )
 EOF
 
-    do_build ios //app:app --define=apple.package_swift_support=no \
+    do_build ios //app:ipa_app --define=apple.package_swift_support=no \
       || fail "Should build"
     assert_zip_contains "test-bin/app/app.ipa" \
         "Payload/app.app/Frameworks/libswiftCore.dylib"
@@ -146,7 +152,7 @@ swift_library(
 )
 EOF
 
-  do_build ios //app:app || fail "Should build"
+  do_build ios //app:ipa_app || fail "Should build"
   assert_ipa_contains_swift_dylibs_for_device
 }
 
@@ -162,7 +168,7 @@ swift_library(
 )
 EOF
 
-  do_build ios //app:app --features=asan || fail "Should build"
+  do_build ios //app:ipa_app --features=asan || fail "Should build"
 
   if is_device_build ios ; then
     assert_zip_contains "test-bin/app/app.ipa" \
@@ -187,7 +193,7 @@ swift_library(
 )
 EOF
 
-    do_build ios //app:app --features=tsan \
+    do_build ios //app:ipa_app --features=tsan \
         || fail "Should build"
     assert_zip_contains "test-bin/app/app.ipa" \
         "Payload/app.app/Frameworks/libclang_rt.tsan_iossim_dynamic.dylib"
@@ -206,7 +212,7 @@ swift_library(
 )
 EOF
 
-  do_build ios //app:app --features=asan || fail "Should build"
+  do_build ios //app:ipa_app --features=asan || fail "Should build"
 
   if is_device_build ios ; then
     assert_zip_contains "test-bin/app/app.ipa" \
@@ -232,7 +238,7 @@ EOF
   # The clang_rt resolution implemented in tools/clangrttool.py requires
   # the presence of a clang_rt*.dylib rpath.
 
-  do_build ios //app:app --features=include_clang_rt --linkopt=-fsanitize=address \
+  do_build ios //app:ipa_app --features=include_clang_rt --linkopt=-fsanitize=address \
         || fail "Should build"
 
   if is_device_build ios ; then
@@ -261,7 +267,7 @@ EOF
     # The clang_rt resolution implemented in tools/clangrttool.py requires
     # the presence of a clang_rt*.dylib rpath.
 
-    do_build ios //app:app --features=include_clang_rt --linkopt=-fsanitize=thread \
+    do_build ios //app:ipa_app --features=include_clang_rt --linkopt=-fsanitize=thread \
         || fail "Should build"
     assert_zip_contains "test-bin/app/app.ipa" \
         "Payload/app.app/Frameworks/libclang_rt.tsan_iossim_dynamic.dylib"
@@ -283,7 +289,7 @@ EOF
   # The clang_rt resolution implemented in tools/clangrttool.py requires
   # the presence of a clang_rt*.dylib rpath.
 
-  do_build ios //app:app --features=include_clang_rt --linkopt=-fsanitize=undefined \
+  do_build ios //app:ipa_app --features=include_clang_rt --linkopt=-fsanitize=undefined \
         || fail "Should build"
 
   if is_device_build ios ; then
@@ -307,7 +313,7 @@ swift_library(
 )
 EOF
 
-  do_build ios //app:app --features=apple.include_main_thread_checker \
+  do_build ios //app:ipa_app --features=apple.include_main_thread_checker \
         || fail "Should build"
 
   assert_zip_contains "test-bin/app/app.ipa" \