fixing conflicts

Author: vitormesquita

Example/Malert.xcodeproj/project.pbxproj

@@ -2,17 +2,4 @@ use_frameworks!
 
 target 'Malert_Example' do
   pod 'Malert', :path => '../'
-
-  target 'Malert_Tests' do
-    inherit! :search_paths
-
-  end
 end
-
-#post_install do |installer|
-#    installer.pods_project.targets.each do |target|
-#        target.build_configurations.each do |configuration|
-#            configuration.build_settings['SWIFT_VERSION'] = "3.0"
-#        end
-#    end
-#end

Example/Malert/view/FiveCustomView.swift

@@ -4,18 +4,18 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Malert'
-  s.version          = '3.1.4'
+  s.version          = '4.0'
   s.summary          = 'A simple, easy and very customizable alert'
   s.description      = <<-DESC
     Malert came to facilitate make custom alert views, introducing as `UIAlertController`.
                        DESC
-
   s.homepage         = 'https://github.com/vitormesquita/Malert'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'Vitor Mesquita' => 'vitor.mesquita09@gmail.com' }
   s.source           = { :git => 'https://github.com/vitormesquita/Malert.git', :tag => s.version.to_s }
+  s.swift_versions   = [4.2, 5.0]
 
-  s.ios.deployment_target = '9.0'
+  s.ios.deployment_target = '10.0'
 
   s.source_files = 'Malert/Classes/**/*'
   s.resource_bundles = {

Example/Malert/view/FiveCustomView.xib

@@ -6,37 +6,36 @@
 //
 //
 
-
 import UIKit
 
 class BaseTransitioning: NSObject {
-    
-    var animationType: MalertAnimationType
-    var duration: TimeInterval
-    
-    init(animationType: MalertAnimationType, duration: TimeInterval) {
-        self.animationType = animationType
-        self.duration = duration
-        super.init()
-    }
-    
-    func buildMalertAnimation(malertView: UIView, width: CGFloat, height: CGFloat) {
-        switch animationType {
-        case .modalBottom:
-            malertView.transform = CGAffineTransform.init(translationX: 0, y: height)
-            break
-            
-        case .modalLeft:
-            malertView.transform = CGAffineTransform.init(translationX: -width, y: 0)
-            break
-            
-        case .modalRight:
-            malertView.transform = CGAffineTransform.init(translationX: width, y: 0)
-            break
-            
-        case .fadeIn:
-            malertView.alpha = 0
-            break
-        }
-    }
+   
+   var animationType: MalertAnimationType
+   var duration: TimeInterval
+   
+   init(animationType: MalertAnimationType, duration: TimeInterval) {
+      self.animationType = animationType
+      self.duration = duration
+      super.init()
+   }
+   
+   func buildMalertAnimation(malertView: UIView, width: CGFloat, height: CGFloat) {
+      switch animationType {
+      case .modalBottom:
+         malertView.transform = CGAffineTransform.init(translationX: 0, y: height)
+         break
+         
+      case .modalLeft:
+         malertView.transform = CGAffineTransform.init(translationX: -width, y: 0)
+         break
+         
+      case .modalRight:
+         malertView.transform = CGAffineTransform.init(translationX: width, y: 0)
+         break
+         
+      case .fadeIn:
+         malertView.alpha = 0
+         break
+      }
+   }
 }