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

merge accelerators #65

Merged
merged 7 commits into from Nov 11, 2020

Conversation

abdulajet
Copy link
Contributor

@abdulajet abdulajet commented Nov 3, 2020

Pull request checklist

  • All tests pass. Demo project builds and runs.
  • I have resolved any merge conflicts.

TODO: Update README
TODO: Update travis.yml
See #66

What's in this pull request?

This PR brings in the TextChat and Annotation Accelerators into the Core project. It is quite a big PR but you can review commit by commit. The first two commits are mainly copying in the text chat and annotation projects. Below is a screenshot of the project structure. The sample projects and test targets have been copied over with the source files for the accelerators under the core folder.

image

);
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";

Choose a reason for hiding this comment

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

I think it is a good idea to call pod deintegrate before commiting the changes so the code in the repo is "free" from cocoapods modification

@rperezcubero
Copy link

Started to do some reviews, but relized that this PR was not about reviewing the code of the old accelerator packs we had so I removed those comments.

Just left one about the pop deintegrate but in any case feel free to merge as it is if you decide to.

@abdulajet
Copy link
Contributor Author

Thanks, ill run the pod deintegrate

Copy link
Contributor

@marinaserranomontes marinaserranomontes left a comment

Choose a reason for hiding this comment

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

LGTM

* add new projects to travis file

* update README

* remove old sample repo
@marinaserranomontes marinaserranomontes merged commit 521903d into master Nov 11, 2020
@abdulajet abdulajet deleted the aajetunmobi/devx-xx-merge-accelerators branch November 11, 2020 15:48
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

3 participants