Skip to content
This repository has been archived by the owner on Nov 26, 2020. It is now read-only.

Carthage Support #74

Merged
merged 11 commits into from Jun 8, 2016
Merged

Carthage Support #74

merged 11 commits into from Jun 8, 2016

Conversation

alexpopov
Copy link
Contributor

I had to restructure the directory structure a little bit, and tested both creating a new CocoaPods project and a new Carthage project with my fork.

I had to add a pair of compiler directives for SSZipArchive and UIMenuItem_CXAImageSupport;

  • SSZipArchive drops the module prefix when installed through Carthage
  • UIMenuItem_CXAImageSupport doesn't seem to be the same between CocoaPods and Carthage so I changed the initializer depending on whether CocoaPods or Carthage is used.

There is one final caveat: I had to add Carthage support to UIMenuItem and ZFDragableModalTransition, but my pull requests have not been accepted yet. When (if) they're accepted we'll need to update the FolioReader Cartfile to reference them instead of my forks (so we can keep getting upstream updates).

That said, UIMenuItem is deprecated, so it may also be wise to update to the latest version of that (I added Carthage support to that one as well, also not merged yet).

@hebertialmeida
Copy link
Member

Great! Just one thing, can you update the Readme with the cartage option and installation instructions?

@hebertialmeida
Copy link
Member

About the menu have you checked this https://github.com/cxa/MenuItemKit
It is the same menu written in Swift, and now it has Cocoapods support, the issue #41 is about a migration.

@alexpopov
Copy link
Contributor Author

I will update the Readme tonight; I'll bring my computer home.

re: MenuItemKit, I actually submitted a Carthage Support PR for that too, so we can use it with Carthage 😛 It shouldn't be hard to swap in.

@alexpopov
Copy link
Contributor Author

Okay, I updated the README and set Carthage to point to the original UIMenuItem.
I've resolved the umbrella header warning in my UIMenuItem branch, so I submitted another PR to cxa for that, and the warning will go away whenever that gets accepted.

I also updated the Carthage scheme to deploy to 8.0

There is a problem right now, JSQWebViewController intermittently times-out while building; that's not an issue on our end, it's is most likely a bug in Carthage; I'll create an issue for it.

@hebertialmeida hebertialmeida merged commit 9150551 into FolioReader:master Jun 8, 2016
@hebertialmeida hebertialmeida self-assigned this Sep 21, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants