Sync with upstream, and fixed for Xcode 14

.bazelrc

@@ -5,6 +5,7 @@ build --cpu=darwin_x86_64
 build --apple_platform_type=macos
 build --compilation_mode=dbg
 build --swiftcopt=-whole-module-optimization 
+build --macos_minimum_os=11.0
 
 # Disable the Swift compilation worker when running integration tests, since it
 # requires the protobuf dependency which is infeasible to get working on Bazel.
@@ -27,3 +28,7 @@ test --curses=no
 test --show_timestamps
 # This is required for re-invoking bazel in shell tests. CI adds it implicitly
 test --test_env=HOME
+
+# Print test logs for failed tests. This makes it easier to debug without
+# having to download test logs from CI everytime.
+test --test_output=errors

.bazelversion

@@ -1 +1 @@
-5.0.0rc3
+5.3.1

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     name: macos_latest
     uses: bazelbuild/tulsi/.github/workflows/macos.yml@master
     with:
-      bazel: latest
+      bazel: rolling
       name: macos_latest
   macos_last_green:
     name: macos_last_green

.github/workflows/macos.yml

@@ -5,10 +5,10 @@ on:
         type: string
       bazel:
         type: string
-        default: latest
+        default: rolling
       xcode_version:
         type: string
-        default: "13.2.1"
+        default: "13.4.1"
       build_targets:
         type: string
         default: //:tulsi
@@ -24,7 +24,7 @@ on:
 
 jobs:
   macos:
-    runs-on: macos-11
+    runs-on: macos-12
     env:
       USE_BAZEL_VERSION: ${{ inputs.bazel }}
     steps:

BUILD

@@ -12,7 +12,7 @@ load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application")
 
 package(default_visibility = ["//:__subpackages__"])
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 exports_files(["LICENSE"])
 
@@ -79,7 +79,7 @@ macos_application(
         "//conditions:default": None,
     }),
     infoplists = [":Info.plist"],
-    minimum_os_version = "10.13",
+    minimum_os_version = "11.0",
     strings = [":strings"],
     version = ":AppVersion",
     visibility = ["//visibility:public"],

CHANGELOG.md

@@ -1,5 +1,22 @@
 # CHANGELOG
 
+## 0.12.0
+<h2>Tulsi++ 0.12.0 </h2>
+
+<h2>⚠️ IMPORTANT:</h2>
+<h4>Tulsi++ 0.12.0 and forward will have different codesign credential. This means you need to manually remove your Old Tulsi++ and download and install it manually from <a href="https://github.com/wendyliga/tulsi-plus-plus/releases">here</a><h4>
+
+<h2>Changelog:</h2>
+<ol> 
+    <li>Use New Build System by default</li>
+    <li>Fix Xcode 14 issues</li>
+    <li>Fix New Build System Issues</li>
+    <li>Bump minimum macos version to 11.0</li>
+    <li>Sync with Upstream</li>
+</ol>
+
+----
+
 ## 0.11.0
 <h2>Tulsi++ 0.11.0 </h2>
 <ol> 

WORKSPACE

@@ -2,8 +2,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "build_bazel_rules_apple",
-    sha256 = "36072d4f3614d309d6a703da0dfe48684ec4c65a89611aeb9590b45af7a3e592",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.0.1/rules_apple.1.0.1.tar.gz",
+    sha256 = "90e3b5e8ff942be134e64a83499974203ea64797fd620eddeb71b3a8e1bff681",
+    url = "https://github.com/bazelbuild/rules_apple/releases/download/1.1.2/rules_apple.1.1.2.tar.gz",
 )
 
 load(

src/Tulsi/AnnouncementBanner.swift

@@ -18,6 +18,9 @@ import Cocoa
 class AnnouncementBanner: NSView {
   let announcement: Announcement
 
+  var delegate: AnnouncementBannerDelegate?
+
+  let messageView = NSView(frame: CGRect.zero)
   let messageLabel = NSTextField(wrappingLabelWithString: "Placeholder")
   let dismissButton = NSButton(frame: CGRect.zero)
 
@@ -30,22 +33,22 @@ class AnnouncementBanner: NSView {
 
     super.init(frame: CGRect.zero)
     wantsLayer = true
-    layer?.opacity = 1
     translatesAutoresizingMaskIntoConstraints = false
 
+    messageView.translatesAutoresizingMaskIntoConstraints = false
+
     messageLabel.stringValue = announcement.bannerMessage
     messageLabel.setAccessibilityLabel(announcement.bannerMessage)
     messageLabel.isBezeled = false
     messageLabel.isEditable = false
     messageLabel.isSelectable = false
-    messageLabel.backgroundColor = NSColor.clear
     messageLabel.translatesAutoresizingMaskIntoConstraints = false
 
     if announcement.link != nil {
       let gestureRecognizer = NSClickGestureRecognizer(
         target: self,
         action: #selector(openUrl(_:)))
-      messageLabel.addGestureRecognizer(gestureRecognizer)
+      messageView.addGestureRecognizer(gestureRecognizer)
     }
 
     dismissButton.target = self
@@ -55,24 +58,19 @@ class AnnouncementBanner: NSView {
     dismissButton.isBordered = false
     dismissButton.translatesAutoresizingMaskIntoConstraints = false
 
+    let accessiblityComment = "Dismisses the announcement banner."
     let dismissButtonAccessibilityLabel = NSLocalizedString(
-      "AnnouncementBanner_DismissButtonAccessibilityLabel",
-      comment: "Accessibility label for the announcement banner dismiss button")
+      "AnnouncementBanner_DismissButtonAccessibilityLabel", comment: accessiblityComment)
     dismissButton.setAccessibilityLabel(dismissButtonAccessibilityLabel)
 
-    // If dark mode is supported, use a system color. Otherwise, default to
-    // colors that are suitable for light mode.
-    if #available(macOS 10.14, *) {
-      layer?.backgroundColor = NSColor.controlAccentColor.cgColor
-      messageLabel.textColor = NSColor.controlTextColor
-      dismissButton.attributedTitle = createTitle(withColor: NSColor.controlTextColor)
-    } else {
-      layer?.backgroundColor = NSColor.lightGray.cgColor
-      messageLabel.textColor = NSColor.black
-      dismissButton.attributedTitle = createTitle(withColor: NSColor.black)
-    }
+    dismissButton.image = NSImage(
+      systemSymbolName: "xmark.circle.fill", accessibilityDescription: accessiblityComment)
+    dismissButton.contentTintColor = NSColor.white
+    layer?.backgroundColor = NSColor.systemGray.cgColor
+    messageLabel.textColor = NSColor.white
 
-    self.addSubview(messageLabel)
+    self.addSubview(messageView)
+    messageView.addSubview(messageLabel)
     self.addSubview(dismissButton)
 
     activateConstraints()
@@ -89,9 +87,10 @@ class AnnouncementBanner: NSView {
   @objc func didClickDismissButton(_ sender: NSButton) {
     announcement.recordDismissal()
     self.removeFromSuperview()
+    self.delegate?.announcementBannerWasDismissed(banner: self)
   }
 
-  @objc func openUrl(_ sender: NSView) {
+  @objc func openUrl(_ sender: Any?) {
     if let link = announcement.link, let url = URL(string: link) {
       NSWorkspace.shared.open(url)
     }
@@ -102,45 +101,32 @@ class AnnouncementBanner: NSView {
   func activateConstraints() {
     removeConstraints(self.constraints)
 
-    // Message label constraints
-    let messageLabelCenterYContstraint = NSLayoutConstraint(
-      item: messageLabel, attribute: .centerY, relatedBy: .equal, toItem: self,
-      attribute: .centerY, multiplier: 1, constant: 0)
-    let messageLabelLeadingConstraint = NSLayoutConstraint(
-      item: messageLabel, attribute: .leading, relatedBy: .equal, toItem: self,
-      attribute: .leading, multiplier: 1, constant: margin)
-    let messageLabelTrailingConstraint = NSLayoutConstraint(
-      item: messageLabel, attribute: .trailing, relatedBy: .lessThanOrEqual, toItem: dismissButton,
-      attribute: .leading, multiplier: 1, constant: -margin)
-    let messageLabelTopConstraint = NSLayoutConstraint(
-      item: messageLabel, attribute: .top, relatedBy: .equal, toItem: self, attribute: .top,
-      multiplier: 1, constant: margin)
-
-    // Dismiss button constraints
-    let dismissButtonTrailingConstraint = NSLayoutConstraint(
-      item: dismissButton, attribute: .trailing, relatedBy: .equal, toItem: self,
-      attribute: .trailing, multiplier: 1, constant: -margin)
-    let dismissButtonTopConstraint = NSLayoutConstraint(
-      item: dismissButton, attribute: .top, relatedBy: .equal, toItem: self, attribute: .top,
-      multiplier: 1, constant: margin)
-    let dismissButtonCenterYConstraint = NSLayoutConstraint(
-      item: dismissButton, attribute: .centerY, relatedBy: .equal, toItem: self,
-      attribute: .centerY, multiplier: 1, constant: 0)
-
-    NSLayoutConstraint.activate([
-      messageLabelCenterYContstraint, messageLabelLeadingConstraint,
-      messageLabelTrailingConstraint, messageLabelTopConstraint, dismissButtonTrailingConstraint,
-      dismissButtonTopConstraint, dismissButtonCenterYConstraint,
-    ])
+    let views = ["view": messageView, "btn": dismissButton]
+    let labels = ["msg": messageLabel]
+
+    messageView.addConstraints(
+      NSLayoutConstraint.constraints(
+        withVisualFormat: "H:|-8-[msg]-8-|", options: .alignAllCenterX, metrics: nil,
+        views: labels))
+    messageView.addConstraints(
+      NSLayoutConstraint.constraints(
+        withVisualFormat: "V:|-8-[msg]-8-|", options: .directionLeadingToTrailing, metrics: nil,
+        views: labels))
+
+    self.addConstraints(
+      NSLayoutConstraint.constraints(
+        withVisualFormat: "H:|-0-[view]-0-[btn]-8-|",
+        options: NSLayoutConstraint.FormatOptions.alignAllCenterY, metrics: nil, views: views))
+    messageView.setContentHuggingPriority(.defaultLow, for: .horizontal)
+    dismissButton.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+
+    self.addConstraints(
+      NSLayoutConstraint.constraints(
+        withVisualFormat: "V:|-0-[view]-0-|", options: .directionLeadingToTrailing, metrics: nil,
+        views: views))
   }
+}
 
-  private func createTitle(withColor color: NSColor) -> NSAttributedString {
-    let pstyle = NSMutableParagraphStyle()
-
-    pstyle.alignment = .center
-
-    return NSAttributedString(
-      string: "X",
-      attributes: [.foregroundColor: color, .paragraphStyle: pstyle])
-  }
+protocol AnnouncementBannerDelegate {
+  func announcementBannerWasDismissed(banner: AnnouncementBanner)
 }

src/Tulsi/BUILD

@@ -1,8 +1,10 @@
-package(default_visibility = ["//:__subpackages__"])
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
-licenses(["notice"])
+package(
+    default_visibility = ["//:__subpackages__"],
+)
 
-load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+licenses(["notice"])
 
 exports_files(["Info.plist"])