diff --git a/.swift-version b/.swift-version index 5186d07..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.2 diff --git a/AppearanceKit.podspec b/AppearanceKit.podspec index d91fc2f..07cfc96 100644 --- a/AppearanceKit.podspec +++ b/AppearanceKit.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'AppearanceKit' - s.version = '2.15' + s.version = '2.16' s.summary = 'Change the appearance of UIKit elements.' # This description is used to generate tags and improve search results. diff --git a/AppearanceKit/Classes/appearances/content/UIButtonAppearance.swift b/AppearanceKit/Classes/appearances/content/UIButtonAppearance.swift index 7e56dc1..870ef1c 100644 --- a/AppearanceKit/Classes/appearances/content/UIButtonAppearance.swift +++ b/AppearanceKit/Classes/appearances/content/UIButtonAppearance.swift @@ -59,14 +59,14 @@ public extension UIButtonAppearance { if let titleLabelAppearance = self.titleLabelAppearance { let textColor = titleLabelAppearance.textColor - aContent.setTitleColor(textColor?.color, for: UIControlState.normal) - aContent.setTitleColor(textColor?.highlighted?.color, for: UIControlState.highlighted) - aContent.setTitleColor(textColor?.highlighted?.color, for: [UIControlState.highlighted, UIControlState.selected]) - aContent.setTitleColor(textColor?.disabled?.color, for: UIControlState.disabled) - aContent.setTitleColor(textColor?.selected?.color, for: UIControlState.selected) + aContent.setTitleColor(textColor?.color, for: UIControl.State.normal) + aContent.setTitleColor(textColor?.highlighted?.color, for: UIControl.State.highlighted) + aContent.setTitleColor(textColor?.highlighted?.color, for: [UIControl.State.highlighted, UIControl.State.selected]) + aContent.setTitleColor(textColor?.disabled?.color, for: UIControl.State.disabled) + aContent.setTitleColor(textColor?.selected?.color, for: UIControl.State.selected) aContent.setTitleShadowColor(titleLabelAppearance.shadowColor?.color, - for: UIControlState.normal) + for: UIControl.State.normal) if let shadowOffset = titleLabelAppearance.shadowOffset?.asCGSize { aContent.titleLabel?.shadowOffset = shadowOffset @@ -75,18 +75,18 @@ public extension UIButtonAppearance { aContent.titleLabel?.font = titleLabelAppearance.font?.font } else { - aContent.setTitleColor(self.titleColor?.color, for: UIControlState.normal) - aContent.setTitleColor(self.titleColor?.highlighted?.color, for: UIControlState.highlighted) - aContent.setTitleColor(self.titleColor?.highlighted?.color, for: [UIControlState.highlighted, UIControlState.selected]) - aContent.setTitleColor(self.titleColor?.disabled?.color, for: UIControlState.disabled) - aContent.setTitleColor(self.titleColor?.selected?.color, for: UIControlState.selected) + aContent.setTitleColor(self.titleColor?.color, for: UIControl.State.normal) + aContent.setTitleColor(self.titleColor?.highlighted?.color, for: UIControl.State.highlighted) + aContent.setTitleColor(self.titleColor?.highlighted?.color, for: [UIControl.State.highlighted, UIControl.State.selected]) + aContent.setTitleColor(self.titleColor?.disabled?.color, for: UIControl.State.disabled) + aContent.setTitleColor(self.titleColor?.selected?.color, for: UIControl.State.selected) - aContent.setTitleShadowColor(self.shadowColor?.color, for: UIControlState.normal) - aContent.setTitleShadowColor(self.shadowColor?.highlighted?.color, for: UIControlState.highlighted) - aContent.setTitleShadowColor(self.shadowColor?.highlighted?.color, for: [UIControlState.highlighted, UIControlState.selected]) + aContent.setTitleShadowColor(self.shadowColor?.color, for: UIControl.State.normal) + aContent.setTitleShadowColor(self.shadowColor?.highlighted?.color, for: UIControl.State.highlighted) + aContent.setTitleShadowColor(self.shadowColor?.highlighted?.color, for: [UIControl.State.highlighted, UIControl.State.selected]) - aContent.setTitleColor(self.shadowColor?.disabled?.color, for: UIControlState.disabled) - aContent.setTitleColor(self.shadowColor?.selected?.color, for: UIControlState.selected) + aContent.setTitleColor(self.shadowColor?.disabled?.color, for: UIControl.State.disabled) + aContent.setTitleColor(self.shadowColor?.selected?.color, for: UIControl.State.selected) if let shadowOffset = self.shadowOffset?.asCGSize { aContent.titleLabel?.shadowOffset = shadowOffset diff --git a/AppearanceKit/Classes/color/TextColor.swift b/AppearanceKit/Classes/color/TextColor.swift index 3f51fdf..5d74d4b 100644 --- a/AppearanceKit/Classes/color/TextColor.swift +++ b/AppearanceKit/Classes/color/TextColor.swift @@ -52,22 +52,22 @@ public extension TextColor { public extension TextColor { public func configure(button: UIButton, - forStates states: [UIControlState]) { + forStates states: [UIControl.State]) { states.forEach { state in button.setTitleColor(self.color(fromState: state)?.color, for: state) } } - public func color(fromState state: UIControlState) -> Color? { + public func color(fromState state: UIControl.State) -> Color? { switch state { - case UIControlState.disabled: + case UIControl.State.disabled: return self.disabled - case UIControlState.normal: + case UIControl.State.normal: return self - case UIControlState.highlighted: + case UIControl.State.highlighted: return self.highlighted - case UIControlState.selected: + case UIControl.State.selected: return self.selected default: return self.normal diff --git a/AppearanceKit/Classes/image/FlippedImage.swift b/AppearanceKit/Classes/image/FlippedImage.swift index 3613f98..624a466 100644 --- a/AppearanceKit/Classes/image/FlippedImage.swift +++ b/AppearanceKit/Classes/image/FlippedImage.swift @@ -54,62 +54,62 @@ final public class FlippedImage: ContentKit.Image { fileprivate extension FlippedImage.Flip { - fileprivate func imageOrientation(fromCurrentOrientation currentOrientation: UIImageOrientation) -> UIImageOrientation { + fileprivate func imageOrientation(fromCurrentOrientation currentOrientation: UIImage.Orientation) -> UIImage.Orientation { switch (self, currentOrientation) { // horizontal - up - case (FlippedImage.Flip.horizontal, UIImageOrientation.up): - return UIImageOrientation.upMirrored + case (FlippedImage.Flip.horizontal, UIImage.Orientation.up): + return UIImage.Orientation.upMirrored - case (FlippedImage.Flip.horizontal, UIImageOrientation.upMirrored): - return UIImageOrientation.up + case (FlippedImage.Flip.horizontal, UIImage.Orientation.upMirrored): + return UIImage.Orientation.up // horizontal - left - case (FlippedImage.Flip.horizontal, UIImageOrientation.left): - return UIImageOrientation.leftMirrored + case (FlippedImage.Flip.horizontal, UIImage.Orientation.left): + return UIImage.Orientation.leftMirrored - case (FlippedImage.Flip.horizontal, UIImageOrientation.leftMirrored): - return UIImageOrientation.left + case (FlippedImage.Flip.horizontal, UIImage.Orientation.leftMirrored): + return UIImage.Orientation.left // horizontal - right - case (FlippedImage.Flip.horizontal, UIImageOrientation.right): - return UIImageOrientation.rightMirrored + case (FlippedImage.Flip.horizontal, UIImage.Orientation.right): + return UIImage.Orientation.rightMirrored - case (FlippedImage.Flip.horizontal, UIImageOrientation.rightMirrored): - return UIImageOrientation.right + case (FlippedImage.Flip.horizontal, UIImage.Orientation.rightMirrored): + return UIImage.Orientation.right // horizontal - down - case (FlippedImage.Flip.horizontal, UIImageOrientation.down): - return UIImageOrientation.downMirrored + case (FlippedImage.Flip.horizontal, UIImage.Orientation.down): + return UIImage.Orientation.downMirrored - case (FlippedImage.Flip.horizontal, UIImageOrientation.downMirrored): - return UIImageOrientation.down + case (FlippedImage.Flip.horizontal, UIImage.Orientation.downMirrored): + return UIImage.Orientation.down // vertical - up - case (FlippedImage.Flip.vertical, UIImageOrientation.up): - return UIImageOrientation.downMirrored + case (FlippedImage.Flip.vertical, UIImage.Orientation.up): + return UIImage.Orientation.downMirrored - case (FlippedImage.Flip.vertical, UIImageOrientation.upMirrored): - return UIImageOrientation.up + case (FlippedImage.Flip.vertical, UIImage.Orientation.upMirrored): + return UIImage.Orientation.up // vertical - left - case (FlippedImage.Flip.vertical, UIImageOrientation.left): - return UIImageOrientation.rightMirrored + case (FlippedImage.Flip.vertical, UIImage.Orientation.left): + return UIImage.Orientation.rightMirrored - case (FlippedImage.Flip.vertical, UIImageOrientation.leftMirrored): - return UIImageOrientation.right + case (FlippedImage.Flip.vertical, UIImage.Orientation.leftMirrored): + return UIImage.Orientation.right // vertical - right - case (FlippedImage.Flip.vertical, UIImageOrientation.right): - return UIImageOrientation.leftMirrored - case (FlippedImage.Flip.vertical, UIImageOrientation.rightMirrored): - return UIImageOrientation.left + case (FlippedImage.Flip.vertical, UIImage.Orientation.right): + return UIImage.Orientation.leftMirrored + case (FlippedImage.Flip.vertical, UIImage.Orientation.rightMirrored): + return UIImage.Orientation.left // vertical - down - case (FlippedImage.Flip.vertical, UIImageOrientation.down): - return UIImageOrientation.upMirrored - case (FlippedImage.Flip.vertical, UIImageOrientation.downMirrored): - return UIImageOrientation.up + case (FlippedImage.Flip.vertical, UIImage.Orientation.down): + return UIImage.Orientation.upMirrored + case (FlippedImage.Flip.vertical, UIImage.Orientation.downMirrored): + return UIImage.Orientation.up } } diff --git a/AppearanceKit/Classes/image/MultipleStateImage.swift b/AppearanceKit/Classes/image/MultipleStateImage.swift index e9ba477..ab8bef0 100644 --- a/AppearanceKit/Classes/image/MultipleStateImage.swift +++ b/AppearanceKit/Classes/image/MultipleStateImage.swift @@ -34,39 +34,39 @@ public protocol MultipleStateImage: Image { var original: UIImage? { get } func configure(button: UIButton, - forStates states: [UIControlState]) + forStates states: [UIControl.State]) func configureBackground(button: UIButton, - forStates states: [UIControlState]) + forStates states: [UIControl.State]) - func image(fromState state: UIControlState) -> Image? + func image(fromState state: UIControl.State) -> Image? } public extension MultipleStateImage { - public func configure(button: UIButton, forStates states: [UIControlState]) { + public func configure(button: UIButton, forStates states: [UIControl.State]) { states.forEach { state in button.setImage(self.image(fromState: state)?.image, for: state) } } - public func configureBackground(button: UIButton, forStates states: [UIControlState]) { + public func configureBackground(button: UIButton, forStates states: [UIControl.State]) { states.forEach { state in button.setBackgroundImage(self.image(fromState: state)?.image, for: state) } } - public func image(fromState state: UIControlState) -> Image? { + public func image(fromState state: UIControl.State) -> Image? { switch state { - case UIControlState.disabled: + case UIControl.State.disabled: return self.disabled - case UIControlState.normal: + case UIControl.State.normal: return self - case UIControlState.highlighted: + case UIControl.State.highlighted: return self.highlighted - case UIControlState.selected: + case UIControl.State.selected: return self.selected default: return self.normal diff --git a/AppearanceKit/Classes/image/RenderingModeImage.swift b/AppearanceKit/Classes/image/RenderingModeImage.swift index ab2d0ed..7440e1b 100644 --- a/AppearanceKit/Classes/image/RenderingModeImage.swift +++ b/AppearanceKit/Classes/image/RenderingModeImage.swift @@ -79,14 +79,14 @@ final public class MultipleStateRenderingModeImage: RenderingModeImage, Multiple fileprivate extension RenderingModeImage.Mode { - fileprivate var renderingMode: UIImageRenderingMode { + fileprivate var renderingMode: UIImage.RenderingMode { switch self { case RenderingModeImage.Mode.automatic: - return UIImageRenderingMode.automatic + return UIImage.RenderingMode.automatic case RenderingModeImage.Mode.alwaysOriginal: - return UIImageRenderingMode.alwaysOriginal + return UIImage.RenderingMode.alwaysOriginal case RenderingModeImage.Mode.alwaysTemplate: - return UIImageRenderingMode.alwaysTemplate + return UIImage.RenderingMode.alwaysTemplate } } } diff --git a/AppearanceKit/Classes/image/ResizableImage.swift b/AppearanceKit/Classes/image/ResizableImage.swift index 7f61287..1bcde50 100644 --- a/AppearanceKit/Classes/image/ResizableImage.swift +++ b/AppearanceKit/Classes/image/ResizableImage.swift @@ -112,12 +112,12 @@ final public class MultipleStateResizableImage: ResizableImage, MultipleStateIma fileprivate extension ResizableImage.Mode { - fileprivate var resizingMode: UIImageResizingMode { + fileprivate var resizingMode: UIImage.ResizingMode { switch self { case ResizableImage.Mode.tile: - return UIImageResizingMode.tile + return UIImage.ResizingMode.tile case ResizableImage.Mode.stretch: - return UIImageResizingMode.stretch + return UIImage.ResizingMode.stretch } } } diff --git a/AppearanceKit/Classes/image/RotatedImage.swift b/AppearanceKit/Classes/image/RotatedImage.swift index ba069e7..0db5812 100644 --- a/AppearanceKit/Classes/image/RotatedImage.swift +++ b/AppearanceKit/Classes/image/RotatedImage.swift @@ -132,66 +132,66 @@ public class RotatedImage: ContentKit.Image { fileprivate extension RotatedImage.Rotation { - fileprivate func imageOrientation(fromCurrentImageOrientation currentOrientation: UIImageOrientation) -> UIImageOrientation { + fileprivate func imageOrientation(fromCurrentImageOrientation currentOrientation: UIImage.Orientation) -> UIImage.Orientation { switch (self, currentOrientation) { // left - case (RotatedImage.Rotation.left, UIImageOrientation.up): - return UIImageOrientation.left + case (RotatedImage.Rotation.left, UIImage.Orientation.up): + return UIImage.Orientation.left - case (RotatedImage.Rotation.left, UIImageOrientation.down): - return UIImageOrientation.right + case (RotatedImage.Rotation.left, UIImage.Orientation.down): + return UIImage.Orientation.right - case (RotatedImage.Rotation.left, UIImageOrientation.left): - return UIImageOrientation.down + case (RotatedImage.Rotation.left, UIImage.Orientation.left): + return UIImage.Orientation.down - case (RotatedImage.Rotation.left, UIImageOrientation.right): - return UIImageOrientation.up + case (RotatedImage.Rotation.left, UIImage.Orientation.right): + return UIImage.Orientation.up // right - case (RotatedImage.Rotation.right, UIImageOrientation.up): - return UIImageOrientation.right + case (RotatedImage.Rotation.right, UIImage.Orientation.up): + return UIImage.Orientation.right - case (RotatedImage.Rotation.right, UIImageOrientation.down): - return UIImageOrientation.left + case (RotatedImage.Rotation.right, UIImage.Orientation.down): + return UIImage.Orientation.left - case (RotatedImage.Rotation.right, UIImageOrientation.left): - return UIImageOrientation.up + case (RotatedImage.Rotation.right, UIImage.Orientation.left): + return UIImage.Orientation.up - case (RotatedImage.Rotation.right, UIImageOrientation.right): - return UIImageOrientation.down + case (RotatedImage.Rotation.right, UIImage.Orientation.right): + return UIImage.Orientation.down // left mirrored - case (RotatedImage.Rotation.left, UIImageOrientation.upMirrored): - return UIImageOrientation.leftMirrored + case (RotatedImage.Rotation.left, UIImage.Orientation.upMirrored): + return UIImage.Orientation.leftMirrored - case (RotatedImage.Rotation.left, UIImageOrientation.downMirrored): - return UIImageOrientation.rightMirrored + case (RotatedImage.Rotation.left, UIImage.Orientation.downMirrored): + return UIImage.Orientation.rightMirrored - case (RotatedImage.Rotation.left, UIImageOrientation.leftMirrored): - return UIImageOrientation.downMirrored + case (RotatedImage.Rotation.left, UIImage.Orientation.leftMirrored): + return UIImage.Orientation.downMirrored - case (RotatedImage.Rotation.left, UIImageOrientation.rightMirrored): - return UIImageOrientation.upMirrored + case (RotatedImage.Rotation.left, UIImage.Orientation.rightMirrored): + return UIImage.Orientation.upMirrored // right mirrored - case (RotatedImage.Rotation.right, UIImageOrientation.upMirrored): - return UIImageOrientation.rightMirrored + case (RotatedImage.Rotation.right, UIImage.Orientation.upMirrored): + return UIImage.Orientation.rightMirrored - case (RotatedImage.Rotation.right, UIImageOrientation.downMirrored): - return UIImageOrientation.leftMirrored + case (RotatedImage.Rotation.right, UIImage.Orientation.downMirrored): + return UIImage.Orientation.leftMirrored - case (RotatedImage.Rotation.right, UIImageOrientation.leftMirrored): - return UIImageOrientation.upMirrored + case (RotatedImage.Rotation.right, UIImage.Orientation.leftMirrored): + return UIImage.Orientation.upMirrored - case (RotatedImage.Rotation.right, UIImageOrientation.rightMirrored): - return UIImageOrientation.downMirrored + case (RotatedImage.Rotation.right, UIImage.Orientation.rightMirrored): + return UIImage.Orientation.downMirrored default: - return UIImageOrientation.up + return UIImage.Orientation.up } } } diff --git a/AppearanceKit/Classes/image/TrimmedImage.swift b/AppearanceKit/Classes/image/TrimmedImage.swift index bd446e8..edd2066 100644 --- a/AppearanceKit/Classes/image/TrimmedImage.swift +++ b/AppearanceKit/Classes/image/TrimmedImage.swift @@ -114,7 +114,7 @@ fileprivate extension UIImage { } else { let rect = CGRect(x: 0, y: 0, width: self.size.width * self.scale, height: self.size.height * self.scale) - let cropRect = UIEdgeInsetsInsetRect(rect, crop) + let cropRect = rect.inset(by: crop) if let cropped = self.cgImage?.cropping(to: cropRect) { let image = UIImage(cgImage: cropped, scale: self.scale, diff --git a/AppearanceKit/Classes/text/AttributedText.swift b/AppearanceKit/Classes/text/AttributedText.swift index f1dcba8..8e620b0 100644 --- a/AppearanceKit/Classes/text/AttributedText.swift +++ b/AppearanceKit/Classes/text/AttributedText.swift @@ -90,7 +90,7 @@ extension AttributedText { let string = NSMutableAttributedString(string: self.content) let range = NSMakeRange(0, (string.string as NSString).length) for attribute in self._attributes { - let atts = [NSAttributedStringKey(rawValue: attribute.key): attribute.value.value] + let atts = [NSAttributedString.Key(rawValue: attribute.key): attribute.value.value] string.addAttributes(atts, range: range) } return string.copy() as! NSAttributedString @@ -377,32 +377,32 @@ extension AttributedText.Attribute { attribute: String, value: Any) { guard let att = { () -> AttributedText.Attribute? in - switch NSAttributedStringKey(rawValue: attribute) { - case NSAttributedStringKey.font: + switch NSAttributedString.Key(rawValue: attribute) { + case NSAttributedString.Key.font: let font = AnyFont(font: value as! UIFont) return AttributedText.Attribute.font(font) - case NSAttributedStringKey.foregroundColor: + case NSAttributedString.Key.foregroundColor: let color = AnyColor(color: value as! UIColor) return AttributedText.Attribute.color(color) - case NSAttributedStringKey.backgroundColor: + case NSAttributedString.Key.backgroundColor: let color = AnyColor(color: value as! UIColor) return AttributedText.Attribute.backgroundColor(color) - case NSAttributedStringKey.strokeColor: + case NSAttributedString.Key.strokeColor: let color = AnyColor(color: value as! UIColor) return AttributedText.Attribute.strokeColor(color) - case NSAttributedStringKey.strokeWidth: + case NSAttributedString.Key.strokeWidth: let width = (value as! NSNumber).floatValue return AttributedText.Attribute.strokeWidth(width) - case NSAttributedStringKey.shadow: + case NSAttributedString.Key.shadow: let shadow = AttributedText.Shadow(shadow: (value as! NSShadow)) return AttributedText.Attribute.shadow(shadow) - case NSAttributedStringKey.paragraphStyle: + case NSAttributedString.Key.paragraphStyle: let style = AttributedText.ParagraphStyle(style: (value as! NSParagraphStyle)) return AttributedText.Attribute.style(style) @@ -415,28 +415,28 @@ extension AttributedText.Attribute { fileprivate extension AttributedText.Attribute { - fileprivate var key: NSAttributedStringKey { + fileprivate var key: NSAttributedString.Key { switch self { case AttributedText.Attribute.font: - return NSAttributedStringKey.font + return NSAttributedString.Key.font case AttributedText.Attribute.color: - return NSAttributedStringKey.foregroundColor + return NSAttributedString.Key.foregroundColor case AttributedText.Attribute.backgroundColor: - return NSAttributedStringKey.backgroundColor + return NSAttributedString.Key.backgroundColor case AttributedText.Attribute.strokeColor: - return NSAttributedStringKey.strokeColor + return NSAttributedString.Key.strokeColor case AttributedText.Attribute.strokeWidth: - return NSAttributedStringKey.strokeWidth + return NSAttributedString.Key.strokeWidth case AttributedText.Attribute.shadow: - return NSAttributedStringKey.shadow + return NSAttributedString.Key.shadow case AttributedText.Attribute.style: - return NSAttributedStringKey.paragraphStyle + return NSAttributedString.Key.paragraphStyle } } @@ -468,10 +468,10 @@ extension AttributedText { } public func configure(button: UIButton) { - self.configure(button: button, forStates: [UIControlState.normal]) + self.configure(button: button, forStates: [UIControl.State.normal]) } - public func configure(button: UIButton, forStates states: [UIControlState]) { + public func configure(button: UIButton, forStates states: [UIControl.State]) { let attributedString = self.attributedString for state in states { button.setAttributedTitle(attributedString, for: state) @@ -632,7 +632,7 @@ public extension AttributedText { var font: Font? { get { - guard let attr = self.attribute(name: NSAttributedStringKey.font.rawValue) else { return nil } + guard let attr = self.attribute(name: NSAttributedString.Key.font.rawValue) else { return nil } return AnyFont(font: attr.value as! UIFont) } set { @@ -643,7 +643,7 @@ public extension AttributedText { var color: Color? { get { - guard let attribute = self.attribute(name: NSAttributedStringKey.foregroundColor.rawValue) else { return nil } + guard let attribute = self.attribute(name: NSAttributedString.Key.foregroundColor.rawValue) else { return nil } return AnyColor(color: attribute.value as! UIColor) } set { @@ -654,7 +654,7 @@ public extension AttributedText { var backgroundColor: Color? { get { - guard let attribute = self.attribute(name: NSAttributedStringKey.backgroundColor.rawValue) else { return nil } + guard let attribute = self.attribute(name: NSAttributedString.Key.backgroundColor.rawValue) else { return nil } return AnyColor(color: attribute.value as! UIColor) } set { @@ -665,7 +665,7 @@ public extension AttributedText { var strokeColor: Color? { get { - guard let attribute = self.attribute(name: NSAttributedStringKey.strokeColor.rawValue) else { return nil } + guard let attribute = self.attribute(name: NSAttributedString.Key.strokeColor.rawValue) else { return nil } return AnyColor(color: attribute.value as! UIColor) } set { @@ -676,7 +676,7 @@ public extension AttributedText { var strokeWidth: Float? { get { - guard let attribute = self.attribute(name: NSAttributedStringKey.strokeWidth.rawValue) else { return nil } + guard let attribute = self.attribute(name: NSAttributedString.Key.strokeWidth.rawValue) else { return nil } return (attribute.value as! NSNumber).floatValue } set { @@ -687,7 +687,7 @@ public extension AttributedText { var shadow: AttributedText.Shadow? { get { - guard let attribute = self.attribute(name: NSAttributedStringKey.shadow.rawValue) else { return nil } + guard let attribute = self.attribute(name: NSAttributedString.Key.shadow.rawValue) else { return nil } return AttributedText.Shadow(shadow: (attribute.value as! NSShadow)) } set { @@ -698,7 +698,7 @@ public extension AttributedText { var style: AttributedText.ParagraphStyle { get { - guard let attribute = self.attribute(name: NSAttributedStringKey.paragraphStyle.rawValue) else { return AttributedText.ParagraphStyle() } + guard let attribute = self.attribute(name: NSAttributedString.Key.paragraphStyle.rawValue) else { return AttributedText.ParagraphStyle() } return AttributedText.ParagraphStyle(style: (attribute.value as! NSParagraphStyle)) } set { diff --git a/AppearanceKit/Classes/text/MultipleAttributedText.swift b/AppearanceKit/Classes/text/MultipleAttributedText.swift index b579551..257a8aa 100644 --- a/AppearanceKit/Classes/text/MultipleAttributedText.swift +++ b/AppearanceKit/Classes/text/MultipleAttributedText.swift @@ -159,10 +159,10 @@ public extension MultipleAttributedText { } public func configure(button: UIButton) { - self.configure(button: button, forStates: [UIControlState.normal]) + self.configure(button: button, forStates: [UIControl.State.normal]) } - public func configure(button: UIButton, forStates states: [UIControlState]) { + public func configure(button: UIButton, forStates states: [UIControl.State]) { let attributedString = self.attributedString for state in states { button.setAttributedTitle(attributedString, for: state) diff --git a/Example/AppearanceKit.xcodeproj/project.pbxproj b/Example/AppearanceKit.xcodeproj/project.pbxproj index 8fad9ce..e26bf1d 100644 --- a/Example/AppearanceKit.xcodeproj/project.pbxproj +++ b/Example/AppearanceKit.xcodeproj/project.pbxproj @@ -7,20 +7,20 @@ objects = { /* Begin PBXBuildFile section */ - 9828A9E71000D164653068F4 /* Pods_AppearanceKit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01D3C88A5BECC88CCD1ADC43 /* Pods_AppearanceKit_Tests.framework */; }; + 407FA842B0F625CDA5E2D811 /* Pods_AppearanceKit_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E934075BA6BA2253DCD83DD /* Pods_AppearanceKit_Tests.framework */; }; F8B1405D1F62BAF400285C3E /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 01D3C88A5BECC88CCD1ADC43 /* Pods_AppearanceKit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppearanceKit_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 1A169806027A6740AECFC52C /* Pods-AppearanceKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppearanceKit_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AppearanceKit_Tests/Pods-AppearanceKit_Tests.debug.xcconfig"; sourceTree = ""; }; + 34970A76EE2BE676D24943F3 /* Pods-AppearanceKit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppearanceKit_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-AppearanceKit_Tests/Pods-AppearanceKit_Tests.release.xcconfig"; sourceTree = ""; }; 607FACE51AFB9204008FA782 /* AppearanceKit_Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppearanceKit_Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = ""; }; 73A435F0A059F6822F466CA6 /* AppearanceKit.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = AppearanceKit.podspec; path = ../AppearanceKit.podspec; sourceTree = ""; }; 7EB7D8DB96CA94A134CADAB9 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; 979EDEAF339C3E81A858C794 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; - BC3CAB361902B4FE55C43049 /* Pods-AppearanceKit_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppearanceKit_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-AppearanceKit_Tests/Pods-AppearanceKit_Tests.release.xcconfig"; sourceTree = ""; }; + 9E934075BA6BA2253DCD83DD /* Pods_AppearanceKit_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppearanceKit_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D4825F255BC1F9EEB3C6EE9A /* Pods-AppearanceKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppearanceKit_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AppearanceKit_Tests/Pods-AppearanceKit_Tests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -28,19 +28,20 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9828A9E71000D164653068F4 /* Pods_AppearanceKit_Tests.framework in Frameworks */, + 407FA842B0F625CDA5E2D811 /* Pods_AppearanceKit_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 4BBB51A2A24B6EE623F5F3D6 /* Frameworks */ = { + 31FADD8FE4F6FFA758D91F8E /* Pods */ = { isa = PBXGroup; children = ( - 01D3C88A5BECC88CCD1ADC43 /* Pods_AppearanceKit_Tests.framework */, + D4825F255BC1F9EEB3C6EE9A /* Pods-AppearanceKit_Tests.debug.xcconfig */, + 34970A76EE2BE676D24943F3 /* Pods-AppearanceKit_Tests.release.xcconfig */, ); - name = Frameworks; + name = Pods; sourceTree = ""; }; 607FACC71AFB9204008FA782 = { @@ -49,8 +50,8 @@ 607FACF51AFB993E008FA782 /* Podspec Metadata */, 607FACE81AFB9204008FA782 /* Tests */, 607FACD11AFB9204008FA782 /* Products */, - C13465BA658EF4F97427EFB4 /* Pods */, - 4BBB51A2A24B6EE623F5F3D6 /* Frameworks */, + 31FADD8FE4F6FFA758D91F8E /* Pods */, + 718E592081AFAF0DD0894D78 /* Frameworks */, ); sourceTree = ""; }; @@ -89,13 +90,12 @@ name = "Podspec Metadata"; sourceTree = ""; }; - C13465BA658EF4F97427EFB4 /* Pods */ = { + 718E592081AFAF0DD0894D78 /* Frameworks */ = { isa = PBXGroup; children = ( - 1A169806027A6740AECFC52C /* Pods-AppearanceKit_Tests.debug.xcconfig */, - BC3CAB361902B4FE55C43049 /* Pods-AppearanceKit_Tests.release.xcconfig */, + 9E934075BA6BA2253DCD83DD /* Pods_AppearanceKit_Tests.framework */, ); - name = Pods; + name = Frameworks; sourceTree = ""; }; /* End PBXGroup section */ @@ -105,11 +105,11 @@ isa = PBXNativeTarget; buildConfigurationList = 607FACF21AFB9204008FA782 /* Build configuration list for PBXNativeTarget "AppearanceKit_Tests" */; buildPhases = ( - 6FF0D64529CB3AEACE0EB107 /* [CP] Check Pods Manifest.lock */, + A795652073358B997DD615F0 /* [CP] Check Pods Manifest.lock */, 607FACE11AFB9204008FA782 /* Sources */, 607FACE21AFB9204008FA782 /* Frameworks */, 607FACE31AFB9204008FA782 /* Resources */, - 6FCC2CF04770D59AC3A0BDCD /* [CP] Embed Pods Frameworks */, + E5D85E8115F79618554D5C1B /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -132,7 +132,7 @@ TargetAttributes = { 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1000; TestTargetID = 607FACCF1AFB9204008FA782; }; }; @@ -166,7 +166,29 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 6FCC2CF04770D59AC3A0BDCD /* [CP] Embed Pods Frameworks */ = { + A795652073358B997DD615F0 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-AppearanceKit_Tests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + E5D85E8115F79618554D5C1B /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -192,28 +214,6 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AppearanceKit_Tests/Pods-AppearanceKit_Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 6FF0D64529CB3AEACE0EB107 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-AppearanceKit_Tests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -335,7 +335,7 @@ }; 607FACF31AFB9204008FA782 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1A169806027A6740AECFC52C /* Pods-AppearanceKit_Tests.debug.xcconfig */; + baseConfigurationReference = D4825F255BC1F9EEB3C6EE9A /* Pods-AppearanceKit_Tests.debug.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", @@ -349,12 +349,13 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Debug; }; 607FACF41AFB9204008FA782 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = BC3CAB361902B4FE55C43049 /* Pods-AppearanceKit_Tests.release.xcconfig */; + baseConfigurationReference = 34970A76EE2BE676D24943F3 /* Pods-AppearanceKit_Tests.release.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", @@ -364,6 +365,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 44c9657..81ebf3d 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,10 +1,10 @@ PODS: - - AppearanceKit (2.15): + - AppearanceKit (2.16): - ContentKit - RepresentationKit - - ContentKit (2.2): + - ContentKit (2.3): - RepresentationKit - - RepresentationKit (2.1) + - RepresentationKit (2.2) DEPENDENCIES: - AppearanceKit (from `../`) @@ -21,16 +21,16 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: ContentKit: - :commit: abfdf935349141eb57f4c4fb306d8f2a6029faba + :commit: def45349a03d039d51db5a71c3ca768bf6ec1d25 :git: https://github.com/averello/ContentKit.git RepresentationKit: - :commit: 02089144a1328f734747939e462b56128ac1278e + :commit: 87c8045f94bbb9aaba43de8273ddee966229190a :git: https://github.com/averello/RepresentationKit.git SPEC CHECKSUMS: - AppearanceKit: b526b21ef53dd19f540a739f0386457506cc39d9 - ContentKit: a274d5a61bb372982e40b4701655d652d7dcdea6 - RepresentationKit: d6ce6839901436f5e1d8053aa2e5fcbc8fa1f38b + AppearanceKit: c625da64ae7fa47707e9caf602ffe323686899ad + ContentKit: 46f66173851d13e8242dc84337a9fd7ec62ed54d + RepresentationKit: f1cbe81fe33fe738a2a3d8a1f752359cbb57172c PODFILE CHECKSUM: 5f0af37e4fd8a2dad8b1e492fe96f4b33e7423d8 diff --git a/Example/Pods/ContentKit/ContentKit/Classes/visual/Image.swift b/Example/Pods/ContentKit/ContentKit/Classes/visual/Image.swift index d0c80d7..74d7986 100644 --- a/Example/Pods/ContentKit/ContentKit/Classes/visual/Image.swift +++ b/Example/Pods/ContentKit/ContentKit/Classes/visual/Image.swift @@ -59,11 +59,11 @@ public extension Image { public func configure(button: UIButton) { button.setImage(self.image, - for: UIControlState.normal) + for: UIControl.State.normal) } public func configureBackground(button: UIButton) { button.setBackgroundImage(self.image, - for: UIControlState.normal) + for: UIControl.State.normal) } } diff --git a/Example/Pods/Local Podspecs/AppearanceKit.podspec.json b/Example/Pods/Local Podspecs/AppearanceKit.podspec.json index a531b2b..3dce927 100644 --- a/Example/Pods/Local Podspecs/AppearanceKit.podspec.json +++ b/Example/Pods/Local Podspecs/AppearanceKit.podspec.json @@ -1,6 +1,6 @@ { "name": "AppearanceKit", - "version": "2.15", + "version": "2.16", "summary": "Change the appearance of UIKit elements.", "description": "TODO: Add long description of the pod here.", "homepage": "https://github.com/averello/AppearanceKit", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/averello/AppearanceKit.git", - "tag": "2.15" + "tag": "2.16" }, "platforms": { "ios": "9.0" diff --git a/Example/Pods/Local Podspecs/ContentKit.podspec.json b/Example/Pods/Local Podspecs/ContentKit.podspec.json index f2d9d57..e24f868 100644 --- a/Example/Pods/Local Podspecs/ContentKit.podspec.json +++ b/Example/Pods/Local Podspecs/ContentKit.podspec.json @@ -1,6 +1,6 @@ { "name": "ContentKit", - "version": "2.2", + "version": "2.3", "summary": "Manage content.", "description": "TODO: Add long description of the pod here.", "homepage": "https://github.com/averello/ContentKit", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/averello/ContentKit.git", - "tag": "2.2" + "tag": "2.3" }, "platforms": { "ios": "8.0" diff --git a/Example/Pods/Local Podspecs/RepresentationKit.podspec.json b/Example/Pods/Local Podspecs/RepresentationKit.podspec.json index 02f2d31..87a932f 100644 --- a/Example/Pods/Local Podspecs/RepresentationKit.podspec.json +++ b/Example/Pods/Local Podspecs/RepresentationKit.podspec.json @@ -1,6 +1,6 @@ { "name": "RepresentationKit", - "version": "2.1", + "version": "2.2", "summary": "Create representation of objects.", "description": "TODO: Add long description of the pod here.", "homepage": "https://github.com/averello/RepresentationKit", @@ -13,7 +13,7 @@ }, "source": { "git": "https://github.com/averello/RepresentationKit.git", - "tag": "2.1" + "tag": "2.2" }, "platforms": { "ios": "8.0" diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 44c9657..81ebf3d 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,10 +1,10 @@ PODS: - - AppearanceKit (2.15): + - AppearanceKit (2.16): - ContentKit - RepresentationKit - - ContentKit (2.2): + - ContentKit (2.3): - RepresentationKit - - RepresentationKit (2.1) + - RepresentationKit (2.2) DEPENDENCIES: - AppearanceKit (from `../`) @@ -21,16 +21,16 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: ContentKit: - :commit: abfdf935349141eb57f4c4fb306d8f2a6029faba + :commit: def45349a03d039d51db5a71c3ca768bf6ec1d25 :git: https://github.com/averello/ContentKit.git RepresentationKit: - :commit: 02089144a1328f734747939e462b56128ac1278e + :commit: 87c8045f94bbb9aaba43de8273ddee966229190a :git: https://github.com/averello/RepresentationKit.git SPEC CHECKSUMS: - AppearanceKit: b526b21ef53dd19f540a739f0386457506cc39d9 - ContentKit: a274d5a61bb372982e40b4701655d652d7dcdea6 - RepresentationKit: d6ce6839901436f5e1d8053aa2e5fcbc8fa1f38b + AppearanceKit: c625da64ae7fa47707e9caf602ffe323686899ad + ContentKit: 46f66173851d13e8242dc84337a9fd7ec62ed54d + RepresentationKit: f1cbe81fe33fe738a2a3d8a1f752359cbb57172c PODFILE CHECKSUM: 5f0af37e4fd8a2dad8b1e492fe96f4b33e7423d8 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 514cef6..0268ad8 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -956,7 +956,7 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 1453A03EAEEC6F338DD4191D3415304C /* Release */ = { + 0215EB19EA6A5BD0A3D385527986BBD8 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = E62109D3EF740362B56DF2B449EE3A2D /* RepresentationKit.xcconfig */; buildSettings = { @@ -980,17 +980,15 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.0; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - 1ADE35C37EE7B15738994E7432CC82E2 /* Debug */ = { + 28F0A33659771FEBAE9F35CF03DE97F7 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 62A3F51EA011A944408D3A73226CE468 /* AppearanceKit.xcconfig */; buildSettings = { @@ -1015,39 +1013,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 58F43C21C0F052360E95D92D239C9508 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = E62109D3EF740362B56DF2B449EE3A2D /* RepresentationKit.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/RepresentationKit/RepresentationKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/RepresentationKit/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/RepresentationKit/RepresentationKit.modulemap"; - PRODUCT_MODULE_NAME = RepresentationKit; - PRODUCT_NAME = RepresentationKit; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1118,9 +1084,9 @@ }; name = Debug; }; - 814BC4C754E54A0CEFB485CE5E48AA4F /* Debug */ = { + 71677E7C162DBB2CD6C0D6DBE240ECA0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 55750D6F97F6D744ACE99D3EC332CB1F /* ContentKit.xcconfig */; + baseConfigurationReference = E62109D3EF740362B56DF2B449EE3A2D /* RepresentationKit.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1131,24 +1097,26 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/ContentKit/ContentKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/ContentKit/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/RepresentationKit/RepresentationKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/RepresentationKit/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/ContentKit/ContentKit.modulemap"; - PRODUCT_MODULE_NAME = ContentKit; - PRODUCT_NAME = ContentKit; + MODULEMAP_FILE = "Target Support Files/RepresentationKit/RepresentationKit.modulemap"; + PRODUCT_MODULE_NAME = RepresentationKit; + PRODUCT_NAME = RepresentationKit; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; 904926F24AC5C2EBAC184F853C522789 /* Debug */ = { isa = XCBuildConfiguration; @@ -1185,7 +1153,7 @@ }; name = Debug; }; - 96F39CC547BA4087DA72F2C9C2C15A1E /* Release */ = { + B9D3BF752245E08A741D83722D6CF9AF /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 55750D6F97F6D744ACE99D3EC332CB1F /* ContentKit.xcconfig */; buildSettings = { @@ -1209,9 +1177,41 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + BABD97777109FA3513D5E2DCF8FC20E9 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 62A3F51EA011A944408D3A73226CE468 /* AppearanceKit.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/AppearanceKit/AppearanceKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/AppearanceKit/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/AppearanceKit/AppearanceKit.modulemap"; + PRODUCT_MODULE_NAME = AppearanceKit; + PRODUCT_NAME = AppearanceKit; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1278,40 +1278,6 @@ }; name = Release; }; - D399EE04202121BA6A32F960F3F8C1D0 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 62A3F51EA011A944408D3A73226CE468 /* AppearanceKit.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/AppearanceKit/AppearanceKit-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/AppearanceKit/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/AppearanceKit/AppearanceKit.modulemap"; - PRODUCT_MODULE_NAME = AppearanceKit; - PRODUCT_NAME = AppearanceKit; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; DF7CFF5AAB107D1A52C03F3ED8314E18 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = D175141B5961EF8236E5B92DC3A24809 /* Pods-AppearanceKit_Tests.release.xcconfig */; @@ -1348,6 +1314,40 @@ }; name = Release; }; + FB1791BDAA365535757161CEFDA5FC72 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 55750D6F97F6D744ACE99D3EC332CB1F /* ContentKit.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/ContentKit/ContentKit-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/ContentKit/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/ContentKit/ContentKit.modulemap"; + PRODUCT_MODULE_NAME = ContentKit; + PRODUCT_NAME = ContentKit; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1372,8 +1372,8 @@ 57794C5610386DDC1247678231E55968 /* Build configuration list for PBXNativeTarget "RepresentationKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - 58F43C21C0F052360E95D92D239C9508 /* Debug */, - 1453A03EAEEC6F338DD4191D3415304C /* Release */, + 0215EB19EA6A5BD0A3D385527986BBD8 /* Debug */, + 71677E7C162DBB2CD6C0D6DBE240ECA0 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1381,8 +1381,8 @@ 6DF24F0A7CBC4727637E982AC3C79DC8 /* Build configuration list for PBXNativeTarget "ContentKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - 814BC4C754E54A0CEFB485CE5E48AA4F /* Debug */, - 96F39CC547BA4087DA72F2C9C2C15A1E /* Release */, + B9D3BF752245E08A741D83722D6CF9AF /* Debug */, + FB1791BDAA365535757161CEFDA5FC72 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1390,8 +1390,8 @@ EC136E3DE38CCA955F9DE81AA22FA713 /* Build configuration list for PBXNativeTarget "AppearanceKit" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1ADE35C37EE7B15738994E7432CC82E2 /* Debug */, - D399EE04202121BA6A32F960F3F8C1D0 /* Release */, + 28F0A33659771FEBAE9F35CF03DE97F7 /* Debug */, + BABD97777109FA3513D5E2DCF8FC20E9 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/Target Support Files/AppearanceKit/Info.plist b/Example/Pods/Target Support Files/AppearanceKit/Info.plist index 4fcad8b..24a6e1d 100644 --- a/Example/Pods/Target Support Files/AppearanceKit/Info.plist +++ b/Example/Pods/Target Support Files/AppearanceKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.15.0 + 2.16.0 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/ContentKit/Info.plist b/Example/Pods/Target Support Files/ContentKit/Info.plist index c054f9c..d135faf 100644 --- a/Example/Pods/Target Support Files/ContentKit/Info.plist +++ b/Example/Pods/Target Support Files/ContentKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.2.0 + 2.3.0 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/RepresentationKit/Info.plist b/Example/Pods/Target Support Files/RepresentationKit/Info.plist index 7f71fff..c054f9c 100644 --- a/Example/Pods/Target Support Files/RepresentationKit/Info.plist +++ b/Example/Pods/Target Support Files/RepresentationKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.1.0 + 2.2.0 CFBundleSignature ???? CFBundleVersion