From 280efd287a165a8ec6b4864d31e4637d4e4c8396 Mon Sep 17 00:00:00 2001
From: Sebastian Mamczak <smamczak@man.poznan.pl>
Date: Thu, 15 Oct 2020 20:45:56 +0200
Subject: [PATCH 1/2] Updated package to Swift 5.3 and allowed to override the
 bundle from which nib is loaded

---
 NibView.swift             |  3 ++-
 Package.swift             | 15 ++++++++++++---
 Sources/NibLoadable.swift | 14 +++++++++++---
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/NibView.swift b/NibView.swift
index 50dec18..a673d3c 100644
--- a/NibView.swift
+++ b/NibView.swift
@@ -7,7 +7,8 @@
 //
 
 #if canImport(NibView)
-import NibView #endif
+import NibView
+#endif
 import UIKit
 
 open class NibView: UIView, NibLoadable {
diff --git a/Package.swift b/Package.swift
index 0d58ee4..8e13843 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,22 +1,31 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
-let files = [
+let sourceFiles = [
     "Sources/NibLoadable.swift",
     "Sources/NibLoader.swift",
     "Sources/NibViewController.swift",
     "NibView.swift"
 ]
 
+let excludedFiles = [
+    "Example",
+    "Img",
+    "README.md",
+    "CODEOWNERS",
+    "LICENSE"
+]
+
 let package = Package(
     name: "NibView",
+    defaultLocalization: "en",
     products: [
         .library(name: "NibView", targets: ["NibView"])
     ],
     targets: [
-        .target(name: "NibView", path: "", sources: files)
+        .target(name: "NibView", path: "", exclude: excludedFiles, sources: sourceFiles)
     ],
     swiftLanguageVersions: [.v5]
 )
diff --git a/Sources/NibLoadable.swift b/Sources/NibLoadable.swift
index eab5f05..13fdc0d 100644
--- a/Sources/NibLoadable.swift
+++ b/Sources/NibLoadable.swift
@@ -24,7 +24,11 @@ import UIKit
  
  *Optionally* provide custom nib name (defaults to type name):
  
-     class var nibName: String { return "MyCustomView" }
+     static var nibName: String { return "MyCustomView" }
+
+ *Optionally* provide custom bundle (defaults to class location):
+ 
+     static var bundle: Bundle { return Bundle(for: self) }
  
  # Refencing from IB
  
@@ -84,6 +88,7 @@ import UIKit
  */
 public protocol NibLoadable: class {
     static var nibName: String { get }
+    static var bundle: Bundle { get }
 }
 
 // MARK: - From Nib
@@ -94,8 +99,12 @@ public extension NibLoadable where Self: UIView {
          return String(describing: self)
     }
     
+    static var bundle: Bundle {
+        return Bundle(for: self)
+    }
+    
     static func fromNib() -> Self {
-        guard let nib = Bundle(for: self).loadNibNamed(nibName, owner: nil, options: nil) else {
+        guard let nib = self.bundle.loadNibNamed(nibName, owner: nil, options: nil) else {
             fatalError("Failed loading the nib named \(nibName) for 'NibLoadable' view of type '\(self)'.")
         }
         guard let view = (nib.first { $0 is Self }) as? Self else {
@@ -104,4 +113,3 @@ public extension NibLoadable where Self: UIView {
         return view
     }
 }
-

From 2f80fa869b2dc761dbf708d2d3b22168103eccec Mon Sep 17 00:00:00 2001
From: Sebastian Mamczak <smamczak@man.poznan.pl>
Date: Thu, 15 Oct 2020 21:29:01 +0200
Subject: [PATCH 2/2] Added missing class var and restored the documentation

---
 NibView.swift             | 4 ++++
 Sources/NibLoadable.swift | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NibView.swift b/NibView.swift
index a673d3c..c3113ba 100644
--- a/NibView.swift
+++ b/NibView.swift
@@ -17,6 +17,10 @@ open class NibView: UIView, NibLoadable {
         return String(describing: self)
     }
     
+    open class var bundle: Bundle {
+        return Bundle(for: self)
+    }
+    
     open override func awakeAfter(using aDecoder: NSCoder) -> Any? {
         return nibLoader.awakeAfter(using: aDecoder, super.awakeAfter(using: aDecoder))
     }
diff --git a/Sources/NibLoadable.swift b/Sources/NibLoadable.swift
index 13fdc0d..e0157a9 100644
--- a/Sources/NibLoadable.swift
+++ b/Sources/NibLoadable.swift
@@ -24,11 +24,11 @@ import UIKit
  
  *Optionally* provide custom nib name (defaults to type name):
  
-     static var nibName: String { return "MyCustomView" }
+     class var nibName: String { return "MyCustomView" }
 
  *Optionally* provide custom bundle (defaults to class location):
  
-     static var bundle: Bundle { return Bundle(for: self) }
+     class var bundle: Bundle { return Bundle(for: self) }
  
  # Refencing from IB