From dc2962dcb66a8aeccae97996080f5ed7d86836e0 Mon Sep 17 00:00:00 2001 From: George Marmaridis Date: Wed, 21 Oct 2020 12:02:48 +0200 Subject: [PATCH 1/2] Fix podspec version --- BetterSegmentedControl.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BetterSegmentedControl.podspec b/BetterSegmentedControl.podspec index 8945a40..c32c116 100644 --- 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 From 82672cc69cbdf2999770af565bf1d041bc483f45 Mon Sep 17 00:00:00 2001 From: George Marmaridis Date: Tue, 20 Oct 2020 21:17:05 +0200 Subject: [PATCH 2/2] Make `swift build` not throw errors --- Package.swift | 6 ++++-- Pod/Classes/BetterSegmentedControl+IBDesignable.swift | 4 ++++ Pod/Classes/BetterSegmentedControl+IndicatorView.swift | 4 ++++ Pod/Classes/BetterSegmentedControl+Options.swift | 4 ++++ Pod/Classes/BetterSegmentedControl+PredefinedStyles.swift | 4 ++++ ...etterSegmentedControl+UIPointerInteractionDelegate.swift | 4 ++++ Pod/Classes/BetterSegmentedControl.swift | 4 ++++ Pod/Classes/Helpers/UIColor+Helpers.swift | 4 ++++ Pod/Classes/Helpers/UIView+Helpers.swift | 4 ++++ Pod/Classes/Segments/BetterSegmentedControlSegment.swift | 4 ++++ Pod/Classes/Segments/IconSegment.swift | 4 ++++ Pod/Classes/Segments/LabelSegment.swift | 4 ++++ 12 files changed, 48 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index dad00d2..a63691d 100644 --- 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 index b9e863c..f9d3672 100644 --- 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 index 18829c6..6a6be52 100644 --- 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 index 0099e3d..51e66a1 100644 --- 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 index f1a27dd..6b4fb10 100644 --- 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 index 312e6f8..1f4055f 100644 --- 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 index 37bd2e9..c9d05dc 100644 --- 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 index 3a6f8f7..817410c 100644 --- 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 index fce9bf3..981f670 100644 --- 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 index 210353d..5895d3e 100644 --- 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 index faa97dc..01286db 100644 --- 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 index 35927c8..f32f64c 100644 --- 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