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.

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

Changes to fix Catalyst compatibility #4254

Merged
merged 1 commit into from
Jan 20, 2020
Merged

Conversation

CAPIStkidd
Copy link
Contributor

Issue Link 🔗

#4233

Goals ⚽

Fixes compatibility with Catalyst

Implementation Details 🚧

Essentially, in the "Platform+" files, attempts to alias types to their AppKit equivalents for regular macOS apps works file, but fails in Catalyst apps because while those are Mac apps, Catalyst needs UIKit for certain things.

Basically I changed this line in four files

#if canImport(AppKit)

to

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

Which causes the macro to skip over this on Catalyst apps.

Testing Details 🔍

No changes to unit testing performed, though I have successfully tried my fork in a Catalyst app, and the changes above have no effect on the macOS demo app in the project.

@codecov-io
Copy link

Codecov Report

Merging #4254 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #4254   +/-   ##
======================================
  Coverage    41.5%   41.5%           
======================================
  Files         123     123           
  Lines       14045   14045           
======================================
  Hits         5829    5829           
  Misses       8216    8216
Impacted Files Coverage Δ
Source/Charts/Utils/Platform+Color.swift 62.5% <ø> (ø) ⬆️
Source/Charts/Utils/Platform+Touch Handling.swift 0% <ø> (ø) ⬆️
Source/Charts/Utils/Platform+Gestures.swift 11.11% <ø> (ø) ⬆️
Source/Charts/Utils/Platform+Graphics.swift 37.5% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 61ba666...6625688. Read the comment docs.

@liuxuan30 liuxuan30 merged commit a1dbbb7 into ChartsOrg:master Jan 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants