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

xcodeTargetsManualConfig #582

Merged
merged 1 commit into from
Jan 12, 2016
Merged

Conversation

brunobowden
Copy link
Contributor

@brunobowden
Copy link
Contributor Author

@saruye - I hope you don't mind but I reworked your #565 PR. This made it more condensed and I believe more robust as well. Please take a look and let me know what you think. I'm keen to get the PR merged in ASAP as I'll be giving a presentation on it in the Bay Area to some startups.

@saruye
Copy link

saruye commented Jan 10, 2016

hi. I looked through the code and it looks good to me. I think I tried to handle some more edge cases, like if there already is an empty line before the line where to insert the methods, don't add a second empty line and on where to insert new pod methods. But you are right that this is more robust now.
Hope I was still able to help a bit!
The failing travis is only a travis problem I guess?!
If you are publishing any slides for the presentations I would be interested :)

@brunobowden
Copy link
Contributor Author

Thanks @saruye, please take a closer look. When I'm writing that much code, I'm sure that I've made some mistakes and I'm not confident until some flaws have been discovered ;-) Likely the presentation will be recorded and posted online.

The build is failing on OS X due to the install-osx-jdk7.sh script failure whilst trying to install jdk7. I'm not sure what the problem is for that.

Btw, the old method you had before of insertAtLineNumber, turns out that there's an easy way to implement that in Groovy:

podfileLines.addAll(lineNumber, insertLines)

That'll add in all the insertLines at the correct spot. Only one line required.

@brunobowden brunobowden force-pushed the update branch 2 times, most recently from b503a60 to 0d7a5c4 Compare January 12, 2016 02:35
- Manual config mode for Xcode targets in Podfile
- FAQ to explain how to use this
- Better "DO NOT MODIFY" lines for "pod method" + upgrade logic
- Fixes j2objc-contrib#561
- Fixes j2objc-contrib#562
brunobowden added a commit that referenced this pull request Jan 12, 2016
@brunobowden brunobowden merged commit 2b8eabb into j2objc-contrib:master Jan 12, 2016
@brunobowden
Copy link
Contributor Author

@saruye - v0.6.0 of the plugin has been published, please try this out and report back any issues

@saruye
Copy link

saruye commented Jan 15, 2016

I didn't find time yet to look at it again :/ sry. will test it on the weekend!

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.

3 participants