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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

RUMM-369 Fix Carthage for Xcode 11.3 #73

Merged
merged 4 commits into from Apr 8, 2020

Conversation

ncreated
Copy link
Collaborator

@ncreated ncreated commented Apr 8, 2020

What and why?

馃悶 Fixing #71, where it was reported that carthage update doesn't work for Xcode 11.3.

How?

Xcode 11.3 expects *.modulemap to be put inside include/ directory for DatadogPrivate.
This is different in Xcode 11.4 where *.modulemap can be put anywhere.

In result carthage update was failing with:

/usr/bin/xcrun xcodebuild -workspace /Carthage/Checkouts/dd-sdk-ios/instrumented-tests/Integration/Integration.xcworkspace CODE_SIGNING_REQUIRED=NO 

...

xcodebuild: error: Could not resolve package dependencies:
  package has unsupported layout; modulemap '/Carthage/Checkouts/dd-sdk-ios/Datadog/DatadogPrivate/module.modulemap' should be inside the 'include' directory

馃挕 Why carthage update builds Integration.xcworkspace? Well, Carthage scans recursively its Checkouts/ directory and builds every .xcodeproj and .xcworkspace it finds and there is no option to make it ignore particular schemes.

馃巵 I also updated spm-example project to use 1.0.2 pre-release tag, so the same problem doesn't happen there when building Datadog dependency.

馃И I validated all dependency managers by running unit + UI tests:

  • Xcode 11.3.1 (11C505) - OK for Carthage, Cocoapods and SPM both on 馃摫 and Simulator;
  • Xcode 11.4 (11E146) - OK for Carthage, Cocoapods and SPM both on 馃摫 and Simulator.

馃挕 This PR also sets the exactVersion of Datadog SPM package used by spm-example project to a tag on this branch. This is to make this PR correct for Xcode 11.3. We're OK with merging this to master as spm-example will be re-done soon.

Review checklist

  • Feature or bugfix MUST have appropriate tests (unit, integration)
  • Make sure each commit and the PR mention the Issue number or JIRA reference

@ncreated ncreated self-assigned this Apr 8, 2020
@ncreated ncreated marked this pull request as ready for review April 8, 2020 11:10
@ncreated ncreated requested a review from a team as a code owner April 8, 2020 11:10
@ncreated
Copy link
Collaborator Author

ncreated commented Apr 8, 2020

  • I forgot to bump the sdkVersion, doing it right now.

@ncreated ncreated force-pushed the ncreated/RUMM-369-fix-carthage-for-xcode-11.3 branch from 76590b5 to 8880e1d Compare April 8, 2020 12:11
Copy link
Contributor

@buranmert buranmert left a comment

Choose a reason for hiding this comment

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

We should leave a note in this PR on the change in spm-example project.
It requires some context to understand the change.

@ncreated ncreated merged commit 4d2665c into master Apr 8, 2020
@ncreated ncreated deleted the ncreated/RUMM-369-fix-carthage-for-xcode-11.3 branch April 8, 2020 13:06
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

2 participants