Converted project to use Swift Package Manager and updated to Swift 5.3

Author: fumoboy007

.gitignore

@@ -16,6 +16,10 @@ DerivedData
 *.hmap
 *.ipa
 
+# Swift Package Manager
+.build
+Package.resolved
+
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However
@@ -27,7 +31,7 @@ Pods/
 # Sublime Text
 *.sublime-workspace
 
-# OS X
+# macOS
 .DS_Store
 Icon?
 

ModernAppKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,9 @@
+# MIT License
+
+Copyright © 2016–2020 Darren Mo.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

LICENSE.md

@@ -0,0 +1,47 @@
+// swift-tools-version:5.3
+
+import PackageDescription
+
+let package = Package(
+   name: "ModernAppKit",
+   platforms: [
+      .macOS(.v10_11),
+   ],
+   products: [
+      .library(
+         name: "MAKAutoLayoutTextView",
+         targets: [
+            "MAKAutoLayoutTextView",
+         ]
+      ),
+      .library(
+         name: "MAKLayerView",
+         targets: [
+            "MAKLayerView",
+         ]
+      ),
+      .library(
+         name: "MAKShadowView",
+         targets: [
+            "MAKShadowView",
+         ]
+      ),
+   ],
+   targets: [
+      .target(
+         name: "MAKAutoLayoutTextView",
+         dependencies: [
+            "MAKEagerTextStorage",
+         ]
+      ),
+      .target(
+         name: "MAKEagerTextStorage"
+      ),
+      .target(
+         name: "MAKLayerView"
+      ),
+      .target(
+         name: "MAKShadowView"
+      ),
+   ]
+)

ModernAppKit.xcodeproj/project.pbxproj

@@ -1,7 +1,7 @@
 # ModernAppKit
 An assortment of enhancements to AppKit to support modern app development. Addresses deficiencies in Auto Layout support, layer-backed views, and shadows.
 
-Requires Swift 4.2. Tested on macOS 10.14. MIT license.
+Requires Swift 5.3+. Tested on macOS 11. MIT license.
 
 ## AutoLayoutTextView
 An `NSTextView` subclass that implements `intrinsicContentSize` so that the text view can participate in layout outside of a scroll view.
@@ -13,4 +13,4 @@ An `AutoLayoutTextView` subclass that acts like a label. Specifically, it is non
 A layer-backed view with additional APIs for setting background color, border width, border color, and corner radius. Use if you do not need to do custom drawing. Supports animations.
 
 ## ShadowView
-A container view that draws a rectangular shadow underneath its content view in a performant manner.
+A container view that draws a rectangular shadow underneath its content view in a performant manner.

ModernAppKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,6 +1,6 @@
 // MIT License
 //
-// Copyright © 2016-2019 Darren Mo.
+// Copyright © 2016-2020 Darren Mo.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -21,9 +21,13 @@
 // SOFTWARE.
 
 import Cocoa
+import MAKEagerTextStorage
 
 /// An `NSTextView` subclass that implements `intrinsicContentSize` so that the text view
 /// can participate in layout outside of a scroll view.
+///
+/// - Attention: The text storage must be an instance of `EagerTextStorage`.
+/// - Attention: The layout manager must be an instance of `EagerLayoutManager`.
 open class AutoLayoutTextView: NSTextView {
    // MARK: Text Components
 
@@ -46,37 +50,49 @@ open class AutoLayoutTextView: NSTextView {
       willSet {
          if let layoutManager = _layoutManager {
             NotificationCenter.default.removeObserver(self,
-                                                      name: EagerLayoutManager.didCompleteLayout,
+                                                      name: EagerLayoutManager.didCompleteLayoutNotification,
                                                       object: layoutManager)
          }
+
+         _textStorage = nil
+         _layoutManager = nil
       }
 
       didSet {
          if let textContainer = textContainer {
-            if let layoutManager = textContainer.layoutManager {
-               precondition(layoutManager is EagerLayoutManager, "AutoLayoutTextView requires the layout manager to be an instance of EagerLayoutManager.")
-               self._layoutManager = layoutManager as? EagerLayoutManager
-
-               if let textStorage = layoutManager.textStorage {
-                  precondition(textStorage is EagerTextStorage, "AutoLayoutTextView requires the text storage to be an instance of EagerTextStorage.")
-                  self._textStorage = textStorage as? EagerTextStorage
-               }
-            }
+            AutoLayoutTextView.setTextComponents(layoutManager: &_layoutManager,
+                                                 textStorage: &_textStorage,
+                                                 from: textContainer)
          }
 
          if let layoutManager = _layoutManager {
             NotificationCenter.default.addObserver(self,
                                                    selector: #selector(didCompleteLayout(_:)),
-                                                   name: EagerLayoutManager.didCompleteLayout,
+                                                   name: EagerLayoutManager.didCompleteLayoutNotification,
                                                    object: layoutManager)
          }
       }
    }
 
-   // MARK: Initialization
+   private static func setTextComponents(layoutManager layoutManagerOut: inout EagerLayoutManager?,
+                                         textStorage textStorageOut: inout EagerTextStorage?,
+                                         from textContainer: NSTextContainer) {
+      if let layoutManager = textContainer.layoutManager {
+         guard let eagerLayoutManager = layoutManager as? EagerLayoutManager else {
+            preconditionFailure("AutoLayoutTextView requires the layout manager to be an instance of EagerLayoutManager.")
+         }
+         layoutManagerOut = eagerLayoutManager
 
-   private static let textStorageCoderKey = "mo.darren.ModernAppKit.AutoLayoutTextView._textStorage"
-   private static let layoutManagerCoderKey = "mo.darren.ModernAppKit.AutoLayoutTextView._layoutManager"
+         if let textStorage = eagerLayoutManager.textStorage {
+            guard let eagerTextStorage = textStorage as? EagerTextStorage else {
+               preconditionFailure("AutoLayoutTextView requires the text storage to be an instance of EagerTextStorage.")
+            }
+            textStorageOut = eagerTextStorage
+         }
+      }
+   }
+
+   // MARK: Initialization/Deinitialization
 
    public override convenience init(frame frameRect: NSRect) {
       let textContainer = AutoLayoutTextView.makeDefaultTextContainer(withTextViewWidth: frameRect.width)
@@ -92,53 +108,16 @@ open class AutoLayoutTextView: NSTextView {
 
    public override init(frame frameRect: NSRect, textContainer container: NSTextContainer?) {
       if let textContainer = container {
-         if let layoutManager = textContainer.layoutManager {
-            precondition(layoutManager is EagerLayoutManager, "AutoLayoutTextView requires the layout manager to be an instance of EagerLayoutManager.")
-            self._layoutManager = layoutManager as? EagerLayoutManager
-
-            if let textStorage = layoutManager.textStorage {
-               precondition(textStorage is EagerTextStorage, "AutoLayoutTextView requires the text storage to be an instance of EagerTextStorage.")
-               self._textStorage = textStorage as? EagerTextStorage
-            }
-         }
+         AutoLayoutTextView.setTextComponents(layoutManager: &_layoutManager,
+                                              textStorage: &_textStorage,
+                                              from: textContainer)
       }
 
       super.init(frame: frameRect, textContainer: container)
 
       commonInit()
    }
 
-   public required init?(coder: NSCoder) {
-      if let textStorage = coder.decodeObject(forKey: AutoLayoutTextView.textStorageCoderKey) as? EagerTextStorage {
-         self._textStorage = textStorage
-      } else {
-         self._textStorage = EagerTextStorage()
-      }
-      if let layoutManager = coder.decodeObject(forKey: AutoLayoutTextView.layoutManagerCoderKey) as? EagerLayoutManager {
-         self._layoutManager = layoutManager
-      } else {
-         self._layoutManager = EagerLayoutManager()
-      }
-
-      super.init(coder: coder)
-
-      if let layoutManager = _layoutManager {
-         _textStorage?.addLayoutManager(layoutManager)
-
-         if let textContainer = textContainer {
-            layoutManager.addTextContainer(textContainer)
-         } else {
-            let textContainer = AutoLayoutTextView.makeDefaultTextContainer(withTextViewWidth: frame.width)
-            layoutManager.addTextContainer(textContainer)
-
-            textContainer.textView = self
-            self.textContainer = textContainer
-         }
-      }
-
-      commonInit()
-   }
-
    private func commonInit() {
       minSize = NSSize.zero
       maxSize = NSSize(width: CGFloat.infinity, height: CGFloat.infinity)
@@ -148,24 +127,17 @@ open class AutoLayoutTextView: NSTextView {
       if let layoutManager = _layoutManager {
          NotificationCenter.default.addObserver(self,
                                                 selector: #selector(didCompleteLayout(_:)),
-                                                name: EagerLayoutManager.didCompleteLayout,
+                                                name: EagerLayoutManager.didCompleteLayoutNotification,
                                                 object: layoutManager)
       }
    }
 
-   open override func encode(with aCoder: NSCoder) {
-      super.encode(with: aCoder)
-
-      aCoder.encode(_textStorage, forKey: AutoLayoutTextView.textStorageCoderKey)
-      aCoder.encode(_layoutManager, forKey: AutoLayoutTextView.layoutManagerCoderKey)
-   }
-
    deinit {
       if let layoutManager = _layoutManager {
          // Because NSTextView does not support weak references, NotificationCenter will not
          // automatically remove the observer for us.
          NotificationCenter.default.removeObserver(self,
-                                                   name: EagerLayoutManager.didCompleteLayout,
+                                                   name: EagerLayoutManager.didCompleteLayoutNotification,
                                                    object: layoutManager)
       }
    }
@@ -179,6 +151,45 @@ open class AutoLayoutTextView: NSTextView {
       return textContainer
    }
 
+   // MARK: Serialization/Deserialization
+
+   private enum CoderKey {
+      static let textStorage = "mo.darren.ModernAppKit.AutoLayoutTextView._textStorage"
+      static let layoutManager = "mo.darren.ModernAppKit.AutoLayoutTextView._layoutManager"
+   }
+
+   public required init?(coder: NSCoder) {
+      if let textStorage = coder.decodeObject(forKey: CoderKey.textStorage) as? EagerTextStorage {
+         self._textStorage = textStorage
+      } else {
+         self._textStorage = EagerTextStorage()
+      }
+      if let layoutManager = coder.decodeObject(forKey: CoderKey.layoutManager) as? EagerLayoutManager {
+         self._layoutManager = layoutManager
+      } else {
+         self._layoutManager = EagerLayoutManager()
+      }
+
+      super.init(coder: coder)
+
+      if let layoutManager = _layoutManager {
+         _textStorage?.addLayoutManager(layoutManager)
+      }
+
+      let textContainer = self.textContainer ?? AutoLayoutTextView.makeDefaultTextContainer(withTextViewWidth: frame.width)
+      _layoutManager?.addTextContainer(textContainer)
+      textContainer.textView = self
+
+      commonInit()
+   }
+
+   open override func encode(with aCoder: NSCoder) {
+      super.encode(with: aCoder)
+
+      aCoder.encode(_textStorage, forKey: CoderKey.textStorage)
+      aCoder.encode(_layoutManager, forKey: CoderKey.layoutManager)
+   }
+
    // MARK: Intrinsic Content Size
 
    /// Called when the layout manager completes layout.
@@ -213,8 +224,8 @@ open class AutoLayoutTextView: NSTextView {
       let textHeight = layoutManager.usedRect(for: textContainer).height
 
       // The layout manager’s `usedRect(for:)` method returns (width of container, height of text).
-      // We want to use the width of the text for the intrinsic content size, so we need to calculate
-      // it ourselves.
+      // We want to use the width of the text for the intrinsic content size instead of the width
+      // of the container, so we need to calculate it ourselves.
       let textWidth = calculateTextWidth()
 
       let unitSquareSize = self.unitSquareSize