Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exclude AppKit extensions to be compiled for macCatalyst #762

Merged
merged 4 commits into from Nov 19, 2019
Merged

Exclude AppKit extensions to be compiled for macCatalyst #762

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da6f79f
Exclude AppKit extensions to be compiled for macCatalyst
MaxHaertwig Nov 17, 2019
fc4d4f2
Add changelog entry
MaxHaertwig Nov 17, 2019
2cfa5bf
Remove empty lines in changelog
Nov 18, 2019
478e5b2
Merge branch 'master' into exclude-appkit-extensions-catalyst
LucianoPAlmeida Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -34,10 +34,8 @@ The changelog for **SwifterSwift**. Also see the [releases](https://github.com/S
- Implemented `filled(withColor:)` using `UIGraphicsImageRenderer` when available. [#733](https://github.com/SwifterSwift/SwifterSwift/pull/733)
- Updated `kilobytesSize` to be computed independently from `bytesSize` [#753](https://github.com/SwifterSwift/SwifterSwift/pull/753) by [mmdock](https://github.com/mmdock)
- Updated `init?(base64String:)` to take in a `scale` factor paramater. [#753](https://github.com/SwifterSwift/SwifterSwift/pull/753) by [mmdock](https://github.com/mmdock)

- **UIImage**:
- Refactored `tint(_:blendMode:)` using UIGraphicsImageRenderer if available. [#731](https://github.com/SwifterSwift/SwifterSwift/pull/731) by [FraDeliro](https://github.com/FraDeliro).

- **Sequence**:
- Corrected documentation for `sorted(by:with:)` and `sorted(by:)`. [#751](https://github.com/SwifterSwift/SwifterSwift/pull/751) by [mmdock](https://github.com/mmdock)

Expand All @@ -46,6 +44,7 @@ The changelog for **SwifterSwift**. Also see the [releases](https://github.com/S
### Removed

### Fixed
- Fixed build error occurring when building AppKit extensions for macCatalyst. [#762](https://github.com/SwifterSwift/SwifterSwift/pull/762) by [MaxHaertwig](https://github.com/maxhaertwig).

### Security

Expand Down
2 changes: 1 addition & 1 deletion Sources/SwifterSwift/AppKit/NSColorExtensions.swift
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2019 SwifterSwift
//

#if canImport(AppKit)
#if canImport(AppKit) && !targetEnvironment(macCatalyst)
MaxHaertwig marked this conversation as resolved.
Show resolved Hide resolved
import AppKit

public extension NSColor {
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwifterSwift/AppKit/NSImageExtensions.swift
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2017 SwifterSwift
//

#if canImport(AppKit)
#if canImport(AppKit) && !targetEnvironment(macCatalyst)
import AppKit

// MARK: - Methods
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwifterSwift/AppKit/NSViewExtensions.swift
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
// Copyright © 2017 SwifterSwift
//

#if canImport(AppKit)
#if canImport(AppKit) && !targetEnvironment(macCatalyst)
import AppKit

// MARK: - Properties
Expand Down