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

vendored_libraries for podspec #512

Merged
merged 1 commit into from
Oct 20, 2015
Merged

vendored_libraries for podspec #512

merged 1 commit into from
Oct 20, 2015

Conversation

brunobowden
Copy link
Contributor

  • spec.libraries relpaced with spec.{ios|osx|watchos}.vendored_libraries
  • j2objc lib LIBRARY_SEARCH_PATH xcconfig removed

Fixes #460

@brunobowden
Copy link
Contributor Author

cc @maxbritto

I'm seeing a failure in systemTests/multiProject1. Creating a PR to see if the automatic build sees the same issue.

advayDev1
advayDev1 reviewed Oct 15, 2015
View reviewed changes
src/main/groovy/com/github/j2objccontrib/j2objcgradle/tasks/PodspecTask.groovy
@@ -159,7 +159,8 @@ class PodspecTask extends DefaultTask {
" spec.resources = '$resourceDir/**/*'\n" +
" spec.requires_arc = true\n" +
" spec.libraries = " + // continuation of same line
"'ObjC', 'guava', 'javax_inject', 'jre_emul', 'jsr305', 'z', 'icucore', '$libName'\n" +
"'ObjC', 'guava', 'javax_inject', 'jre_emul', 'jsr305', 'z', 'icucore'\n" +
" spec.vendored_libraries = '$libName'\n" +
Copy link
Contributor

Choose a reason for hiding this comment

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

did you try what max suggested in the bug?
use the filename as 'lib${libName}.a'

Copy link
Contributor

Choose a reason for hiding this comment

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

well he used the full path, but you have a library search path

@brunobowden
Copy link
Contributor Author

It appears to be a transient failure, so I'm expecting the build to succeed.

@advayDev1
Copy link
Contributor

hmm what was the failure? Travis isn't building the xc project anyway

@brunobowden brunobowden force-pushed the improve branch 4 times, most recently from 8dca219 to 37d2b90 Compare October 15, 2015 08:52
@brunobowden
Copy link
Contributor Author

I believe it was due to using an old plugin build. Haven't seen it since.

The vendored_libraries has been separated out by OS. Example:

spec.libraries = 'ObjC', 'guava', 'javax_inject', 'jre_emul', 'jsr305', 'z', 'icucore'",
spec.ios.vendored_libraries = 'j2objcOutputs/lib/iosDebug/lib$libName'",
spec.osx.vendored_libraries = 'j2objcOutputs/lib/x86_64Debug/lib$libName'",
spec.watchos.vendored_libraries = 'j2objcOutputs/lib/iosDebug/lib$libName'",

@brunobowden brunobowden force-pushed the improve branch 2 times, most recently from 3957649 to 601a3f5 Compare October 15, 2015 08:59
@brunobowden
Copy link
Contributor Author

Still need to test this but it should work.

@advayDev1
Copy link
Contributor

Are you sure you don't need a .a suffix? It's odd if this is working.

@brunobowden
Copy link
Contributor Author

I haven't tested it yet. Fixed by adding the ".a" suffix.

@brunobowden
Copy link
Contributor Author

I will of course test it before merging.

@advayDev1
Copy link
Contributor

Cool, logically LGTM. Merge whenever it passes.

@brunobowden
vendored_libraries + OS deployment targets
a24617b 
vendored_libraries
- spec.libraries relpaced with spec.{ios|osx|watchos}.vendored_libraries
- j2objc lib LIBRARY_SEARCH_PATH xcconfig removed

min OS versions switch to older defaults
- minIosVersion = ‘6.0’
- minOsxVersion = ’10.4’
- minWatchosVersion = ‘1.0’
@advayDev1 advayDev1 mentioned this pull request Oct 16, 2015
Merged
brunobowden added a commit that referenced this pull request Oct 20, 2015
@brunobowden
Merge pull request #512 from brunobowden/improve
cee7d0b 
vendored_libraries for podspec
@brunobowden brunobowden merged commit cee7d0b into j2objc-contrib:master Oct 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@brunobowden @advayDev1