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: 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 diff --git a/R.swift.Library.podspec b/R.swift.Library.podspec index deb7a79..9c9a766 100644 --- a/R.swift.Library.podspec +++ b/R.swift.Library.podspec @@ -21,11 +21,11 @@ Pod::Spec.new do |spec| 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" 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 [](https://cocoapods.org/pods/R.swift) [](https://github.com/Carthage/Carthage) [](blob/master/License)  -_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?