From 6d6d67dd7230bfff810ebf8f1a4b0670e8532e3e Mon Sep 17 00:00:00 2001
From: Filip Bajanik <filip.bajanik@gmail.com>
Date: Fri, 30 Oct 2020 15:30:38 +0100
Subject: [PATCH 1/5] Add support for SPM with WatchOS platform

---
 Library/UIKit/NibResource+UIKit.swift                           | 2 ++
 .../UIKit/StoryboardResourceWithInitialController+UIKit.swift   | 2 ++
 Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift  | 2 ++
 Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift    | 2 ++
 Library/UIKit/UINib+NibResource.swift                           | 2 ++
 Library/UIKit/UIStoryboard+StoryboardResource.swift             | 2 ++
 .../UIKit/UIStoryboard+StoryboardViewControllerResource.swift   | 2 ++
 Library/UIKit/UITableView+ReuseIdentifierProtocol.swift         | 2 ++
 Library/UIKit/UIViewController+NibResource.swift                | 2 ++
 .../UIViewController+StoryboardSegueIdentifierProtocol.swift    | 2 ++
 10 files changed, 20 insertions(+)

diff --git a/Library/UIKit/NibResource+UIKit.swift b/Library/UIKit/NibResource+UIKit.swift
index 4339d3f..2875cc5 100644
--- a/Library/UIKit/NibResource+UIKit.swift
+++ b/Library/UIKit/NibResource+UIKit.swift
@@ -7,6 +7,7 @@
 //  License: MIT License
 //
 
+#if !os(watchOS)
 import Foundation
 import UIKit
 
@@ -23,3 +24,4 @@ public extension NibResourceType {
     return UINib(resource: self).instantiate(withOwner: ownerOrNil, options: optionsOrNil)
   }
 }
+#endif
diff --git a/Library/UIKit/StoryboardResourceWithInitialController+UIKit.swift b/Library/UIKit/StoryboardResourceWithInitialController+UIKit.swift
index b5b114c..4ba1902 100644
--- a/Library/UIKit/StoryboardResourceWithInitialController+UIKit.swift
+++ b/Library/UIKit/StoryboardResourceWithInitialController+UIKit.swift
@@ -7,6 +7,7 @@
 //  License: MIT License
 //
 
+#if !os(watchOS)
 import Foundation
 import UIKit
 
@@ -20,3 +21,4 @@ public extension StoryboardResourceWithInitialControllerType {
     return UIStoryboard(resource: self).instantiateInitialViewController() as? InitialController
   }
 }
+#endif
diff --git a/Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift b/Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift
index 5edd9be..894c8c2 100644
--- a/Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift
+++ b/Library/UIKit/TypedStoryboardSegueInfo+UIStoryboardSegue.swift
@@ -7,6 +7,7 @@
 //  License: MIT License
 //
 
+#if !os(watchOS)
 import Foundation
 import UIKit
 
@@ -33,3 +34,4 @@ extension TypedStoryboardSegueInfo {
     self.destination = destination
   }
 }
+#endif
diff --git a/Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift b/Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift
index bf68fa1..ebac685 100644
--- a/Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift
+++ b/Library/UIKit/UICollectionView+ReuseIdentifierProtocol.swift
@@ -7,6 +7,7 @@
 //  License: MIT License
 //
 
+#if !os(watchOS)
 import Foundation
 import UIKit
 
@@ -62,3 +63,4 @@ public extension UICollectionView {
     register(UINib(resource: nibResource), forSupplementaryViewOfKind: kind, withReuseIdentifier: nibResource.identifier)
   }
 }
+#endif
diff --git a/Library/UIKit/UINib+NibResource.swift b/Library/UIKit/UINib+NibResource.swift
index 73bb048..8aaa0fd 100644
--- a/Library/UIKit/UINib+NibResource.swift
+++ b/Library/UIKit/UINib+NibResource.swift
@@ -7,6 +7,7 @@
 //  License: MIT License
 //
 
+#if !os(watchOS)
 import UIKit
 
 public extension UINib {
@@ -21,3 +22,4 @@ public extension UINib {
     self.init(nibName: resource.name, bundle: resource.bundle)
   }
 }
+#endif
diff --git a/Library/UIKit/UIStoryboard+StoryboardResource.swift b/Library/UIKit/UIStoryboard+StoryboardResource.swift
index 8848be0..1ed8015 100644
--- a/Library/UIKit/UIStoryboard+StoryboardResource.swift
+++ b/Library/UIKit/UIStoryboard+StoryboardResource.swift
@@ -7,6 +7,7 @@
 //  License: MIT License
 //
 
+#if !os(watchOS)
 import UIKit
 
 public extension UIStoryboard {
@@ -21,3 +22,4 @@ public extension UIStoryboard {
     self.init(name: resource.name, bundle: resource.bundle)
   }
 }
+#endif
diff --git a/Library/UIKit/UIStoryboard+StoryboardViewControllerResource.swift b/Library/UIKit/UIStoryboard+StoryboardViewControllerResource.swift
index 59adab3..75c61f0 100644
--- a/Library/UIKit/UIStoryboard+StoryboardViewControllerResource.swift
+++ b/Library/UIKit/UIStoryboard+StoryboardViewControllerResource.swift
@@ -7,6 +7,7 @@
 //  License: MIT License
 //
 
+#if !os(watchOS)
 import Foundation
 import UIKit
 
@@ -22,3 +23,4 @@ public extension UIStoryboard {
     return self.instantiateViewController(withIdentifier: resource.identifier) as? ViewControllerResource.ViewControllerType
   }
 }
+#endif
diff --git a/Library/UIKit/UITableView+ReuseIdentifierProtocol.swift b/Library/UIKit/UITableView+ReuseIdentifierProtocol.swift
index 10d4b4f..aa6589e 100644
--- a/Library/UIKit/UITableView+ReuseIdentifierProtocol.swift
+++ b/Library/UIKit/UITableView+ReuseIdentifierProtocol.swift
@@ -7,6 +7,7 @@
 //  License: MIT License
 //
 
+#if !os(watchOS)
 import Foundation
 import UIKit
 
@@ -65,3 +66,4 @@ public extension UITableView {
     register(UINib(resource: nibResource), forHeaderFooterViewReuseIdentifier: nibResource.identifier)
   }
 }
+#endif
diff --git a/Library/UIKit/UIViewController+NibResource.swift b/Library/UIKit/UIViewController+NibResource.swift
index dbef8ce..717bd09 100644
--- a/Library/UIKit/UIViewController+NibResource.swift
+++ b/Library/UIKit/UIViewController+NibResource.swift
@@ -7,6 +7,7 @@
 //  License: MIT License
 //
 
+#if !os(watchOS)
 import Foundation
 import UIKit
 
@@ -22,3 +23,4 @@ public extension UIViewController {
     self.init(nibName: nib.name, bundle: nib.bundle)
   }
 }
+#endif
diff --git a/Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift b/Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift
index 27364a4..e7aff99 100644
--- a/Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift
+++ b/Library/UIKit/UIViewController+StoryboardSegueIdentifierProtocol.swift
@@ -7,6 +7,7 @@
 //  License: MIT License
 //
 
+#if !os(watchOS)
 import Foundation
 import UIKit
 
@@ -37,3 +38,4 @@ public extension StoryboardSegue where Source : UIViewController {
     source.performSegue(withIdentifier: identifier.identifier, sender: sender)
   }
 }
+#endif

From 3a64127e8113cc33179504dfadc91b361d55a0b1 Mon Sep 17 00:00:00 2001
From: Tom Lokhorst <tom@lokhorst.eu>
Date: Fri, 5 Mar 2021 12:30:22 +0100
Subject: [PATCH 2/5] Update developer dir

---
 .github/workflows/checks.yml  | 4 ++--
 .github/workflows/release.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index c429dfa..5eec115 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -7,7 +7,7 @@ on:
     branches: '*'
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_11.4.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
 
 jobs:
   iOS:
@@ -30,4 +30,4 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Build
-      run: xcodebuild -scheme "Rswift-watchOS"
\ No newline at end of file
+      run: xcodebuild -scheme "Rswift-watchOS"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 76a27a3..ebf96c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
     types: created
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_11.4.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
 
 jobs:
   publish:

From 0e49aa2fac18601585cf16fb24c018362ac59b5c Mon Sep 17 00:00:00 2001
From: Tom Lokhorst <tom@lokhorst.eu>
Date: Fri, 28 Oct 2022 18:01:15 +0200
Subject: [PATCH 3/5] Update minimum deployment target

---
 R.swift.Library.podspec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/R.swift.Library.podspec b/R.swift.Library.podspec
index deb7a79..1059a9d 100644
--- a/R.swift.Library.podspec
+++ b/R.swift.Library.podspec
@@ -17,15 +17,15 @@ Pod::Spec.new do |spec|
 
   spec.requires_arc = true
   spec.source          = { :git => "https://github.com/mac-cain13/R.swift.Library.git", :tag => "v#{spec.version}" }
-  spec.swift_version   = "5.1"
+  spec.swift_version   = "5.7"
 
   spec.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
 
-  spec.ios.deployment_target     = '9.0'
+  spec.ios.deployment_target     = '11.0'
   spec.ios.source_files  = "Library/**/*.swift"
-  spec.tvos.deployment_target    = '9.0'
+  spec.tvos.deployment_target    = '11.0'
   spec.tvos.source_files  = "Library/**/*.swift"
-  spec.watchos.deployment_target = '2.2'
+  spec.watchos.deployment_target = '4.0'
   spec.watchos.source_files  = ["Library/Core/*.swift", "Library/Foundation/*.swift"]
 
   spec.module_name   = "Rswift"

From 4d9815250b2da7ded94ba3936a83d88f5ddfdb0e Mon Sep 17 00:00:00 2001
From: Tom Lokhorst <tom@lokhorst.eu>
Date: Fri, 28 Oct 2022 18:02:13 +0200
Subject: [PATCH 4/5] Keep swift version

---
 R.swift.Library.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R.swift.Library.podspec b/R.swift.Library.podspec
index 1059a9d..9c9a766 100644
--- a/R.swift.Library.podspec
+++ b/R.swift.Library.podspec
@@ -17,7 +17,7 @@ Pod::Spec.new do |spec|
 
   spec.requires_arc = true
   spec.source          = { :git => "https://github.com/mac-cain13/R.swift.Library.git", :tag => "v#{spec.version}" }
-  spec.swift_version   = "5.7"
+  spec.swift_version   = "5.1"
 
   spec.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
 

From bb1ec7e294f7ef6ac0ba072371ae8af5b4342545 Mon Sep 17 00:00:00 2001
From: Tom Lokhorst <tom@lokhorst.eu>
Date: Tue, 29 Nov 2022 00:20:16 +0100
Subject: [PATCH 5/5] Update Readme.md

---
 Readme.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index e79efb8..4180ed7 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,6 +1,8 @@
 # R.swift.Library [![Version](https://img.shields.io/cocoapods/v/R.swift.Library.svg?style=flat)](https://cocoapods.org/pods/R.swift) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![License](https://img.shields.io/cocoapods/l/R.swift.Library.svg?style=flat)](blob/master/License) ![Platform](https://img.shields.io/cocoapods/p/R.swift.Library.svg?style=flat)
 
-_Library containing types supporting code generated by [R.swift](https://github.com/mac-cain13/R.swift)_
+⚠ As of version 7 of [R.swift](https://github.com/mac-cain13/R.swift), this separate library is no longer needed. R.swift is now a self contained library. 
+
+This repository remains for older versions of R.swift.
 
 ## Why use this?