Generic protocols are now default

Author: tib

README.md

@@ -1,29 +1,29 @@
 # VIPER interfaces
 
-Essential interfaces (protocols) for the VIPER architecture.
+Generic interfaces (protocols) for the VIPER architecture.
 
 
 
 ## Installation
 
-### SPM
+### Swift Package Manager
 
 ```
-.package(url: "https://github.com/CoreKit/VIPER", from: "2.0.0"),
+.package(url: "https://github.com/CoreKit/VIPER", from: "3.0.0"),
 ```
 
 
 ### CocoaPods
 
 ```
 source 'https://github.com/CoreKit/VIPER.git'
-pod 'VIPER', '~> 2.0.0'
+pod 'VIPER', '~> 3.0.0'
 ```
 
 ### Carthage
 
 ```
-github "CoreKit/VIPER" "2.0.0"
+github "CoreKit/VIPER" "3.0.0"
 ```
 
 

Sources/VIPER/Interfaces.swift

@@ -8,113 +8,81 @@
 
 import Foundation
 
-// MARK: - basic viper protocols
+// MARK: - interfaces
 
-public protocol ModuleInterface {
-    
-}
-
-public protocol RouterInterface: class {
-    
-}
-
-public protocol PresenterInterface: class {
-    
-}
-
-public protocol InteractorInterface: class {
+public protocol RouterPresenterInterface: class {
 
 }
 
-public protocol ViewInterface: class {
+public protocol InteractorPresenterInterface: class {
 
 }
 
-public protocol EntityInterface {
+public protocol PresenterRouterInterface: class {
 
 }
 
-// MARK: - "i/o" transitions
-
-public protocol RouterPresenterInterface {
+public protocol PresenterInteractorInterface: class {
 
 }
 
-public protocol InteractorPresenterInterface {
+public protocol PresenterViewInterface: class {
 
 }
 
-public protocol PresenterRouterInterface {
+public protocol ViewPresenterInterface: class {
 
 }
 
-public protocol PresenterInteractorInterface {
-    
-}
+// MARK: - viper
 
-public protocol PresenterViewInterface {
-    
-}
-
-public protocol ViewPresenterInterface {
-    
-}
-
-// MARK: - generic interfaces
-
-public protocol GenericRouterInterface: RouterInterface &
-                                        RouterPresenterInterface {
+public protocol RouterInterface: RouterPresenterInterface {
     associatedtype PresenterRouter
-    
+
     var presenter: PresenterRouter! { get set }
 }
 
-public protocol GenericInteractorInterface: InteractorInterface &
-                                            InteractorPresenterInterface {
+public protocol InteractorInterface: InteractorPresenterInterface {
     associatedtype PresenterInteractor
 
     var presenter: PresenterInteractor! { get set }
 }
 
-public protocol GenericPresenterInterface: PresenterInterface &
-                                           PresenterRouterInterface &
-                                           PresenterInteractorInterface &
-                                           PresenterViewInterface
-{
+public protocol PresenterInterface: PresenterRouterInterface & PresenterInteractorInterface & PresenterViewInterface {
     associatedtype RouterPresenter
     associatedtype InteractorPresenter
     associatedtype ViewPresenter
-    
+
     var router: RouterPresenter! { get set }
     var interactor: InteractorPresenter! { get set }
     var view: ViewPresenter! { get set }
 }
 
-public protocol GenericViewInterface: ViewInterface &
-                                      ViewPresenterInterface {
+public protocol ViewInterface: ViewPresenterInterface {
     associatedtype PresenterView
 
     var presenter: PresenterView! { get set }
 }
 
+public protocol EntityInterface {
+    
+}
+
+// MARK: - module
+
+public protocol ModuleInterface {
 
-public protocol GenericModuleInterface: ModuleInterface {
-    associatedtype View where View: GenericViewInterface
-    associatedtype Presenter where Presenter: GenericPresenterInterface
-    associatedtype Router where Router: GenericRouterInterface
-    associatedtype Interactor where Interactor: GenericInteractorInterface
+    associatedtype View where View: ViewInterface
+    associatedtype Presenter where Presenter: PresenterInterface
+    associatedtype Router where Router: RouterInterface
+    associatedtype Interactor where Interactor: InteractorInterface
 
-    func compose(view: View, presenter: Presenter, router: Router, interactor: Interactor)
+    func assemble(view: View, presenter: Presenter, router: Router, interactor: Interactor)
 }
 
-public extension GenericModuleInterface {
+public extension ModuleInterface {
 
-    /**
-        Composes the VIPER module
-     
-        This method will set all the required pointers
-     */
-    func compose(view: View, presenter: Presenter, router: Router, interactor: Interactor) {
+    func assemble(view: View, presenter: Presenter, router: Router, interactor: Interactor) {
         view.presenter = (presenter as! Self.View.PresenterView)
 
         presenter.view = (view as! Self.Presenter.ViewPresenter)

VIPER.podspec

@@ -1,9 +1,9 @@
 Pod::Spec.new do |s|
     s.name             = 'VIPER'
-    s.version          = '2.0.0'
+    s.version          = '3.0.0'
     s.summary          = 'VIPER interfaces'
     s.description      = <<-DESC
-                            Essential interfaces (protocols) for the VIPER architecture.
+                            Generic interfaces (protocols) for the VIPER architecture.
                        DESC
 
     s.homepage         = 'https://theswiftdev.com/'
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
     s.source           = { :git => 'https://github.com/CoreKit/VIPER.git', :tag => s.version.to_s }
     s.social_media_url = 'https://twitter.com/tiborbodecs'
 
-    s.ios.deployment_target = '9.0'
+    s.ios.deployment_target = '12.0'
 
     s.swift_version = '5.0'
     s.source_files = 'Sources/**/*'