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

Add ArcGISToolkit and Alamofire as dependencies #262

Merged
merged 1 commit into from
Nov 24, 2020

Conversation

philium
Copy link
Contributor

@philium philium commented Nov 18, 2020

This makes sure they get built before the data-collection target is built.

image

This makes sure they get built before the data-collection target is built.
@philium philium requested review from mhdostal and esreli November 18, 2020 17:48
Copy link
Contributor

@esreli esreli left a comment

Choose a reason for hiding this comment

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

We have a staged change contained by v.next-1.3 that removes Alamofire altogether (and the concept of a network reachability manager more generally). If you're curious, you can see the full PR.

Will this change introduce a merge conflict when, down the line, we rebase v.next-1.3 on top of work performed in this branch? I suppose that wouldn't be too big of a deal, though I wonder if this PR would more easily integrate as an enhancement to v.next-1.3.

@philium
Copy link
Contributor Author

philium commented Nov 18, 2020

I did a test merge and yes, the changes would introduce merge conflicts, but they look straightforward to resolve. I could help resolve them if you'd like.

@esreli
Copy link
Contributor

esreli commented Nov 18, 2020

#262 (comment)
@mhdostal, i'll let you make the call since you're likely who will be doing the conflict resolution work here. Otherwise this LGTM.

@philium
Copy link
Contributor Author

philium commented Nov 23, 2020

@mhdostal What do you think?

Copy link
Member

@mhdostal mhdostal left a comment

Choose a reason for hiding this comment

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

We can handle the merge for v1.3 closer to that release. It's good to get this in at v1.2.3.

@philium
Copy link
Contributor Author

philium commented Nov 24, 2020

Thank you @mhdostal and @esreli!

@philium philium merged commit e4915d5 into v.next-1.2.3 Nov 24, 2020
@philium philium deleted the Phil9771/add-dependencies branch November 24, 2020 18:05
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