Merge pull request #145 from gmarm/develop

gmarm · web-flow · commit 098a800ad3ad · 2020-10-21T12:08:05.000+02:00
Develop
diff --git a/BetterSegmentedControl.podspec b/BetterSegmentedControl.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = "BetterSegmentedControl"
-s.version          = "2.0"
+s.version          = "2.0.0"
 s.swift_version    = "5.1"
 s.summary          = "An easy to use, customizable replacement for UISegmentedControl & UISwitch."
 s.description      = <<-DESC
@@ -9,7 +9,7 @@ DESC
 s.homepage         = "https://github.com/gmarm/BetterSegmentedControl"
 s.license          = 'MIT'
 s.author           = { "George Marmaridis" => "gmarmas@gmail.com" }
-s.source           = { :git => "https://github.com/gmarm/BetterSegmentedControl.git", :tag => "2.0" }
+s.source           = { :git => "https://github.com/gmarm/BetterSegmentedControl.git", :tag => "2.0.0" }
 s.social_media_url = 'https://twitter.com/gmarmas'
 s.platform         = :ios, '9.0'
 s.requires_arc     = true
diff --git a/Package.swift b/Package.swift
@@ -9,12 +9,14 @@ let package = Package(
     products: [
         .library(
             name: "BetterSegmentedControl",
-            targets: ["BetterSegmentedControl"])
+            targets: ["BetterSegmentedControl"]
+        )
     ],
     targets: [
         .target(
             name: "BetterSegmentedControl",
-            path: "Pod")
+            path: "Pod/Classes"
+        )
     ],
     swiftLanguageVersions: [.v5]
 )
diff --git a/Pod/Classes/BetterSegmentedControl+IBDesignable.swift b/Pod/Classes/BetterSegmentedControl+IBDesignable.swift
@@ -5,6 +5,8 @@
 //  Created by George Marmaridis on 20.10.20.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 extension BetterSegmentedControl {
@@ -36,3 +38,5 @@ extension BetterSegmentedControl {
         }
     }
 }
+
+#endif
diff --git a/Pod/Classes/BetterSegmentedControl+IndicatorView.swift b/Pod/Classes/BetterSegmentedControl+IndicatorView.swift
@@ -5,6 +5,8 @@
 //  Created by George Marmaridis on 19.10.20.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 extension BetterSegmentedControl {
@@ -37,3 +39,5 @@ extension BetterSegmentedControl {
         }
     }
 }
+
+#endif
diff --git a/Pod/Classes/BetterSegmentedControl+Options.swift b/Pod/Classes/BetterSegmentedControl+Options.swift
@@ -6,6 +6,8 @@
 //
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 public extension BetterSegmentedControl {
@@ -30,3 +32,5 @@ public extension BetterSegmentedControl {
         case cornerRadius(CGFloat)
     }
 }
+
+#endif
diff --git a/Pod/Classes/BetterSegmentedControl+PredefinedStyles.swift b/Pod/Classes/BetterSegmentedControl+PredefinedStyles.swift
@@ -5,6 +5,8 @@
 //  Created by George Marmaridis on 18.10.20.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 public extension BetterSegmentedControl {
@@ -21,3 +23,5 @@ public extension BetterSegmentedControl {
         return control
     }
 }
+
+#endif
diff --git a/Pod/Classes/BetterSegmentedControl+UIPointerInteractionDelegate.swift b/Pod/Classes/BetterSegmentedControl+UIPointerInteractionDelegate.swift
@@ -5,6 +5,8 @@
 //  Created by George Marmaridis on 19.10.20.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 @available(iOS 13.4, *)
@@ -32,3 +34,5 @@ extension BetterSegmentedControl: UIPointerInteractionDelegate {
         return .init(effect: .highlight(.init(view: view)))
     }
 }
+
+#endif
diff --git a/Pod/Classes/BetterSegmentedControl.swift b/Pod/Classes/BetterSegmentedControl.swift
@@ -5,6 +5,8 @@
 //  Copyright © 2020 George Marmaridis. All rights reserved.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 @IBDesignable open class BetterSegmentedControl: UIControl {
@@ -499,3 +501,5 @@ extension BetterSegmentedControl: UIGestureRecognizerDelegate {
         return super.gestureRecognizerShouldBegin(gestureRecognizer)
     }
 }
+
+#endif
diff --git a/Pod/Classes/Helpers/UIColor+Helpers.swift b/Pod/Classes/Helpers/UIColor+Helpers.swift
@@ -5,6 +5,8 @@
 //  Created by George Marmaridis on 16.10.20.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 extension UIColor {
@@ -18,3 +20,5 @@ extension UIColor {
         .black
     }
 }
+
+#endif
diff --git a/Pod/Classes/Helpers/UIView+Helpers.swift b/Pod/Classes/Helpers/UIView+Helpers.swift
@@ -5,9 +5,13 @@
 //  Created by George Marmaridis on 19.10.20.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 extension UIView {
     var width: CGFloat { bounds.width }
     var height: CGFloat { bounds.height }
 }
+
+#endif
diff --git a/Pod/Classes/Segments/BetterSegmentedControlSegment.swift b/Pod/Classes/Segments/BetterSegmentedControlSegment.swift
@@ -5,6 +5,8 @@
 //  Created by George Marmaridis on 08/10/2017.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 /// A segment is comprised of a normal state view and a selected state view. These need to be separate view instances.
@@ -18,3 +20,5 @@ public protocol BetterSegmentedControlSegment {
     /// The view to be shown for the active or selected state.
     var selectedView: UIView { get }
 }
+
+#endif
diff --git a/Pod/Classes/Segments/IconSegment.swift b/Pod/Classes/Segments/IconSegment.swift
@@ -5,6 +5,8 @@
 //  Created by George Marmaridis on 10/02/2018.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 open class IconSegment: BetterSegmentedControlSegment {
@@ -93,3 +95,5 @@ public extension IconSegment {
         }
     }
 }
+
+#endif
diff --git a/Pod/Classes/Segments/LabelSegment.swift b/Pod/Classes/Segments/LabelSegment.swift
@@ -5,6 +5,8 @@
 //  Created by George Marmaridis on 08/10/2017.
 //
 
+#if canImport(UIKit)
+
 import UIKit
 
 open class LabelSegment: BetterSegmentedControlSegment {
@@ -111,3 +113,5 @@ public extension LabelSegment {
         }
     }
 }
+
+#endif

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`// Created by George Marmaridis on 20.10.20.`
`6`	`6`	`//`
`7`	`7`
	`8`	`+#if canImport(UIKit)`
	`9`	`+`
`8`	`10`	`import UIKit`
`9`	`11`
`10`	`12`	`extension BetterSegmentedControl {`
`@@ -36,3 +38,5 @@ extension BetterSegmentedControl {`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`	`}`
	`41`	`+`
	`42`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`// Created by George Marmaridis on 19.10.20.`
`6`	`6`	`//`
`7`	`7`
	`8`	`+#if canImport(UIKit)`
	`9`	`+`
`8`	`10`	`import UIKit`
`9`	`11`
`10`	`12`	`extension BetterSegmentedControl {`
`@@ -37,3 +39,5 @@ extension BetterSegmentedControl {`
`37`	`39`	`}`
`38`	`40`	`}`
`39`	`41`	`}`
	`42`	`+`
	`43`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`//`
`7`	`7`	`//`
`8`	`8`
	`9`	`+#if canImport(UIKit)`
	`10`	`+`
`9`	`11`	`import UIKit`
`10`	`12`
`11`	`13`	`public extension BetterSegmentedControl {`
`@@ -30,3 +32,5 @@ public extension BetterSegmentedControl {`
`30`	`32`	`case cornerRadius(CGFloat)`
`31`	`33`	`}`
`32`	`34`	`}`
	`35`	`+`
	`36`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`// Created by George Marmaridis on 18.10.20.`
`6`	`6`	`//`
`7`	`7`
	`8`	`+#if canImport(UIKit)`
	`9`	`+`
`8`	`10`	`import UIKit`
`9`	`11`
`10`	`12`	`public extension BetterSegmentedControl {`
`@@ -21,3 +23,5 @@ public extension BetterSegmentedControl {`
`21`	`23`	`return control`
`22`	`24`	`}`
`23`	`25`	`}`
	`26`	`+`
	`27`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`// Copyright © 2020 George Marmaridis. All rights reserved.`
`6`	`6`	`//`
`7`	`7`
	`8`	`+#if canImport(UIKit)`
	`9`	`+`
`8`	`10`	`import UIKit`
`9`	`11`
`10`	`12`	`@IBDesignable open class BetterSegmentedControl: UIControl {`
`@@ -499,3 +501,5 @@ extension BetterSegmentedControl: UIGestureRecognizerDelegate {`
`499`	`501`	`return super.gestureRecognizerShouldBegin(gestureRecognizer)`
`500`	`502`	`}`
`501`	`503`	`}`
	`504`	`+`
	`505`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`// Created by George Marmaridis on 16.10.20.`
`6`	`6`	`//`
`7`	`7`
	`8`	`+#if canImport(UIKit)`
	`9`	`+`
`8`	`10`	`import UIKit`
`9`	`11`
`10`	`12`	`extension UIColor {`
`@@ -18,3 +20,5 @@ extension UIColor {`
`18`	`20`	`.black`
`19`	`21`	`}`
`20`	`22`	`}`
	`23`	`+`
	`24`	`+#endif`