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

fix: SPM macOS/tvOS disable event explorer #315

Merged
merged 13 commits into from
Nov 17, 2020
Merged

fix: SPM macOS/tvOS disable event explorer #315

merged 13 commits into from
Nov 17, 2020

Conversation

jooohhn
Copy link
Contributor

@jooohhn jooohhn commented Nov 14, 2020

Summary

  • Fixes Error building 7.1.0 on Xcode 12.2 beta 3 for tvOS #298
    • Package.swift conditionally uses EventExplorer files only on iOS platform
  • Reorganize project folder structure to reflect XCode structure and SPM requirements
  • Tested on
    • iOS + SPM project
    • tvOS + SPM project
    • macOS + SPM project

Checklist

  • Does your PR title have the correct title format?
  • Does your PR have a breaking change?: NO

haoliu-amp
haoliu-amp reviewed Nov 14, 2020
View reviewed changes
Copy link
Contributor

@haoliu-amp haoliu-amp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need .build/manifest.db checked in?

haoliu-amp
haoliu-amp reviewed Nov 14, 2020
View reviewed changes
Copy link
Contributor

@haoliu-amp haoliu-amp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need .build/manifest.db checked in?

Amplitude.xcodeproj/project.pbxproj Show resolved Hide resolved
Package.swift Outdated Show resolved Hide resolved
Package.swift Show resolved Hide resolved
@jooohhn
Copy link
Contributor Author

jooohhn commented Nov 16, 2020

Do we need .build/manifest.db checked in?

I think it's an xcode related thing, should we add it to gitignore?

@jooohhn jooohhn merged commit e3e763c into master Nov 17, 2020
@jooohhn jooohhn deleted the macOS-tvOS-disable-event-explorer branch November 17, 2020 03:13
@jooohhn jooohhn mentioned this pull request Nov 17, 2020
Merged
1 task
github-actions bot pushed a commit that referenced this pull request Dec 2, 2020
@amplitude-sdk-bot
chore(release): 7.2.1 [skip ci]
d8047b9 
## [7.2.1](v7.2.0...v7.2.1) (2020-12-02)

### Bug Fixes

* Make resources files to be visible inside xcode project ([#313](#313)) ([64aa1ad](64aa1ad))
* SPM macOS/tvOS disable event explorer ([#315](#315)) ([e3e763c](e3e763c))
@github-actions
Copy link

github-actions bot commented Dec 2, 2020

🎉 This PR is included in version 7.2.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@haoliu-amp haoliu-amp haoliu-amp approved these changes

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Error building 7.1.0 on Xcode 12.2 beta 3 for tvOS
2 participants
@jooohhn @haoliu-amp