Sync with upstream

.bazelversion

@@ -1 +1 @@
-4.2.1
+5.0.0rc3

.gitignore

@@ -23,4 +23,4 @@ src/build/
 /bazel-*
 binary/
 binary/appcast.xml
-.build/
+.build/

BUILD

@@ -69,6 +69,7 @@ macos_application(
     name = "tulsi",
     additional_contents = {
         "//src/tools/bazel_cache_reader": "MacOS",
+        "//src/tools/module_cache_pruner": "MacOS",
     },
     app_icons = ["//src/Tulsi:Icon"],
     bundle_id = "com.wendyliga.TulsiPlusPlus",

Tulsi.tulsiproj/project.tulsiconf

@@ -7,6 +7,9 @@
       "GenerateRunfiles" : {
         "p" : "YES"
       },
+      "ProjectGenerationUseRealFilePath" : {
+        "p" : "NO"
+      },
       "TreeArtifactOutputs" : {
         "p" : "NO"
       }

WORKSPACE

@@ -11,14 +11,16 @@ http_archive(
 # TODO: Remove with next rules_swift + rules_apple release
 http_archive(
     name = "build_bazel_rules_swift",
-    sha256 = "653e8756001616500b110fd156694de7899278bb7480aba22b2f156438a1d810",
-    url = "https://github.com/bazelbuild/rules_swift/releases/download/0.22.0/rules_swift.0.22.0.tar.gz",
+    sha256 = "fff70e28e9b28a4249fbfb413f860cb9b5df567fe20a1bc4017dd89e678dd9b5",
+    strip_prefix = "rules_swift-35ddf9f6e8c0fcd8bcb521e92dd4fd11c3f181b6",
+    url = "https://github.com/bazelbuild/rules_swift/archive/35ddf9f6e8c0fcd8bcb521e92dd4fd11c3f181b6.tar.gz",
 )
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "0052d452af7742c8f3a4e0929763388a66403de363775db7e90adecb2ba4944b",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz",
+    sha256 = "2e6c88b66c671b4abb7cebc5d072804d6fc42bd18aa31586b060e2629aae7251",
+    strip_prefix = "rules_apple-0bba769a9aafe9bd3349b32a326e599553886e98",
+    url = "https://github.com/bazelbuild/rules_apple/archive/0bba769a9aafe9bd3349b32a326e599553886e98.tar.gz",
 )
 
 load(

src/Tulsi/Base.lproj/BazelOpenSheetAccessoryView.xib

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,7 +17,7 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="atU-NU-IiP">
-                    <rect key="frame" x="18" y="19" width="241" height="18"/>
+                    <rect key="frame" x="15" y="18" width="245" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="Use as the default for other projects" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ZsK-jX-81p">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>

src/Tulsi/MessageViewController.swift

@@ -52,7 +52,7 @@ final class MessageViewController: NSViewController, NSTableViewDelegate, NSUser
     ValueTransformer.setValueTransformer(MessageTypeToImageValueTransformer(),
                                            forName: NSValueTransformerName(rawValue: "MessageTypeToImageValueTransformer"))
     super.loadView()
-    bind(NSBindingName(rawValue: "messageCount"), to: messageArrayController, withKeyPath: "arrangedObjects.@count", options: nil)
+    bind(NSBindingName(rawValue: "messageCount"), to: messageArrayController!, withKeyPath: "arrangedObjects.@count", options: nil)
   }
 
   @IBAction func copy(_ sender: AnyObject?) {

src/Tulsi/ProjectEditorConfigManagerViewController.swift

@@ -113,7 +113,7 @@ final class ProjectEditorConfigManagerViewController: NSViewController {
                                            forName: NSValueTransformerName(rawValue: "IsOneValueTransformer"))
     super.loadView()
     bind(NSBindingName(rawValue: "numSelectedConfigs"),
-         to: configArrayController,
+         to: configArrayController!,
          withKeyPath: "selectedObjects.@count",
          options: nil)
     self.generateButton.keyEquivalent = "\r"

src/Tulsi/ProjectEditorPackageManagerViewController.swift

@@ -48,7 +48,7 @@ final class ProjectEditorPackageManagerViewController: NSViewController, NewProj
                                            forName: NSValueTransformerName(rawValue: "PackagePathValueTransformer"))
     super.loadView()
     bind(NSBindingName(rawValue: "numSelectedPackagePaths"),
-         to: packageArrayController,
+         to: packageArrayController!,
          withKeyPath: "selectedObjects.@count",
          options: nil)
   }

src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl

@@ -149,7 +149,9 @@ Filtering information for this target. Only for test target, otherwise is None.
 )
 
 TulsiOutputAspectInfo = provider(
+    doc = """Provides information about an Apple target's outputs.""",
     fields = {
+        "transitive_explicit_modules": "Depset of all explicit modules built by this target.",
         "transitive_generated_files": "Depset of tulsi generated files.",
         "transitive_embedded_bundles": "Depset of all bundles embedded into this target.",
     },
@@ -649,13 +651,31 @@ def _collect_swift_modules(target):
         if module.swift
     ]
 
-def _collect_module_maps(target):
-    """Returns a list of Clang module maps found on the given target."""
-    return [
-        module.clang.module_map
-        for module in target[SwiftInfo].transitive_modules.to_list()
-        if module.clang and type(module.clang.module_map) == "File"
-    ]
+def _collect_clang_modules(target):
+    """Returns a struct with lists of Clang pcms and module maps found on the given target."""
+    if not _is_swift_target(target):
+        return struct(module_maps = [], precompiled_modules = [])
+
+    module_maps = []
+    precompiled_modules = []
+
+    for module in target[SwiftInfo].transitive_modules.to_list():
+        if module.clang == None:
+            continue
+
+        # Collect precompiled modules
+        if module.clang.precompiled_module:
+            precompiled_module = struct(
+                module = module.clang.precompiled_module,
+                name = module.name,
+            )
+            precompiled_modules.append(precompiled_module)
+
+        # Collect module maps
+        if type(module.clang.module_map) == "File":
+            module_maps.append(module.clang.module_map)
+
+    return struct(module_maps = module_maps, precompiled_modules = precompiled_modules)
 
 def _collect_objc_strict_includes(target, rule_attr):
     """Returns a depset of strict includes found on the deps of given target."""
@@ -753,8 +773,9 @@ def _tulsi_sources_aspect(target, ctx):
     is_swift_target = _is_swift_target(target)
 
     if is_swift_target:
+        clang_modules = _collect_clang_modules(target)
         swift_transitive_modules = depset([_file_metadata(f) for f in _collect_swift_modules(target)])
-        objc_module_maps = depset([_file_metadata(f) for f in _collect_module_maps(target)])
+        objc_module_maps = depset([_file_metadata(f) for f in clang_modules.module_maps])
     else:
         swift_transitive_modules = depset()
         objc_module_maps = depset()
@@ -1092,12 +1113,16 @@ def _tulsi_outputs_aspect(target, ctx):
     # A list of bundle infos corresponding to the dependencies of this target.
     direct_embedded_bundles = []
 
+    # A list of all explicit modules that have been built from this targets dependencies.
+    transitive_explicit_modules = []
+
     for attr_name in _TULSI_COMPILE_DEPS:
         deps = _collect_dependencies(rule_attr, attr_name)
         for dep in deps:
             if TulsiOutputAspectInfo in dep:
                 transitive_generated_files.append(dep[TulsiOutputAspectInfo].transitive_generated_files)
                 transitive_embedded_bundles.append(dep[TulsiOutputAspectInfo].transitive_embedded_bundles)
+                transitive_explicit_modules.append(dep[TulsiOutputAspectInfo].transitive_explicit_modules)
 
             # Retrieve the bundle info for embeddable attributes.
             if attr_name not in _TULSI_NON_EMBEDDEDABLE_ATTRS:
@@ -1162,10 +1187,11 @@ def _tulsi_outputs_aspect(target, ctx):
         if cc_info:
             all_files_depsets.append(cc_info.compilation_context.headers)
 
+    clang_modules = _collect_clang_modules(target)
     if _is_swift_target(target):
         all_files_depsets.append(_collect_swift_header(target))
         all_files_depsets.append(depset(_collect_swift_modules(target)))
-        all_files_depsets.append(depset(_collect_module_maps(target)))
+        all_files_depsets.append(depset(clang_modules.module_maps))
 
     source_files = [
         x
@@ -1187,6 +1213,11 @@ def _tulsi_outputs_aspect(target, ctx):
         transitive = transitive_generated_files,
     )
 
+    explicit_modules = depset([
+        struct(name = m.name, path = m.module.path)
+        for m in clang_modules.precompiled_modules
+    ], transitive = transitive_explicit_modules)
+
     has_dsym = _has_dsym(target)
 
     info = _struct_omitting_none(
@@ -1197,6 +1228,7 @@ def _tulsi_outputs_aspect(target, ctx):
         bundle_name = bundle_name,
         embedded_bundles = embedded_bundles.to_list(),
         has_dsym = has_dsym,
+        explicit_modules = explicit_modules.to_list(),
     )
 
     output = ctx.actions.declare_file(target.label.name + ".tulsiouts")
@@ -1205,6 +1237,7 @@ def _tulsi_outputs_aspect(target, ctx):
     return [
         OutputGroupInfo(tulsi_outputs = [output]),
         TulsiOutputAspectInfo(
+            transitive_explicit_modules = explicit_modules,
             transitive_generated_files = generated_files,
             transitive_embedded_bundles = embedded_bundles,
         ),
@@ -1222,7 +1255,6 @@ tulsi_sources_aspect = aspect(
         )),
     },
     toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
-    incompatible_use_toolchain_transition = True,
     fragments = [
         "apple",
         "cpp",

src/TulsiGenerator/BazelAspectInfoExtractor.swift

@@ -231,12 +231,16 @@ final class BazelAspectInfoExtractor: QueuedLogging {
         "--features=-parse_headers",
         // Don't run validation actions during project generation; validation actions could
         // slow down the project generation or fail it.
-        "--experimental_run_validations=0",
+        // TODO: Switch to --norun_validations when we no longer need to support Bazel 4.
+        "--noexperimental_run_validations",
         // The following flags WILL affect Bazel analysis caching.
         // Keep this consistent with bazel_build.py.
         "--aspects",
         "@tulsi//:tulsi/tulsi_aspects.bzl%\(aspect)",
-        "--output_groups=tulsi_info,-_,-default",  // Build only the aspect artifacts.
+        // Build only the aspect artifacts. We explicitly disable the
+        // rules_apple `dsyms` output group since it may trigger a full build
+        // and we've seen some folks enabling it in their rc file.
+        "--output_groups=tulsi_info,-dsyms",
     ])
     arguments.append(contentsOf: targets)
 

src/TulsiGenerator/BazelQueryInfoExtractor.swift

@@ -81,9 +81,8 @@ final class BazelQueryInfoExtractor: QueuedLogging {
     let profilingStart = localizedMessageLogger.startProfiling("extracting_skylark_files",
                                                                message: "Finding Skylark files for \(targets.count) rules")
 
-    let labelDeps = targets.map {"deps(\($0.value))"}
-    let joinedLabelDeps = labelDeps.joined(separator: "+")
-    let query = "buildfiles(\(joinedLabelDeps))"
+    let joinedLabels = targets.map { $0.value }.joined(separator: " + ")
+    let query = "buildfiles(deps(\(joinedLabels)))"
     let buildFiles: Set<BuildLabel>
     do {
       // Errors in the BUILD structure being examined should not prevent partial extraction, so this

src/TulsiGenerator/PBXObjects.swift

@@ -147,7 +147,7 @@ class PBXReference: PBXObjectProtocol {
   fileprivate weak var _parent: PBXReference?
 
   init(name: String, path: String?, sourceTree: SourceTree, parent: PBXReference? = nil) {
-    self.name = name;
+    self.name = name
     self.path = path
     self.sourceTree = sourceTree
     self._parent = parent
@@ -1330,8 +1330,8 @@ final class PBXProject: PBXObjectProtocol {
     try serializer.addField("attributes", attributes)
     try serializer.addField("buildConfigurationList", buildConfigurationList)
     try serializer.addField("compatibilityVersion", compatibilityVersion)
-    try serializer.addField("mainGroup", mainGroup);
-    try serializer.addField("targets", targetByName.values.sorted(by: {$0.name < $1.name}));
+    try serializer.addField("mainGroup", mainGroup)
+    try serializer.addField("targets", targetByName.values.sorted(by: {$0.name < $1.name}))
 
     // Hardcoded defaults to match Xcode behavior.
     try serializer.addField("developmentRegion", "English")

src/TulsiGenerator/RuleEntryMap.swift

@@ -23,6 +23,7 @@ import Foundation
 public class RuleEntryMap {
   private var labelToEntries = [BuildLabel: [RuleEntry]]()
   private var allEntries = [RuleEntry]()
+  private var labelsWithWarning = Set<BuildLabel>()
 
   private let localizedMessageLogger: LocalizedMessageLogger?
 
@@ -97,10 +98,13 @@ public class RuleEntryMap {
       }
     }
 
-    // Must be multiple. Shoot out a warning and return the last.
-    localizedMessageLogger?.warning("AmbiguousRuleEntryReference",
-                                    comment: "Warning when unable to resolve a RuleEntry for a given DeploymentTarget. RuleEntry's label is in %1$@.",
-                                    values: buildLabel.description)
+    if labelsWithWarning.insert(buildLabel).inserted {
+      // Must be multiple. Shoot out a warning and return the last.
+      localizedMessageLogger?.warning("AmbiguousRuleEntryReference",
+                                      comment: "Warning when unable to resolve a RuleEntry for a given DeploymentTarget. RuleEntry's label is in %1$@.",
+                                      values: buildLabel.description)
+    }
+
     return ruleEntries.last
   }
 }