Skip to content

Updated Podfile to absorb changes to WordPressKit - #11142

Closed
ghost wants to merge 4 commits into
developfrom
issue/wpkit-79-integration
Closed

Updated Podfile to absorb changes to WordPressKit#11142
ghost wants to merge 4 commits into
developfrom
issue/wpkit-79-integration

Conversation

@ghost

@ghost ghost commented Feb 25, 2019

Copy link
Copy Markdown

Supports the resolution of [this issue](wordpress-mobile/WordPressKit-iOS#86
wordpress-mobile/WordPressKit-iOS#79) in WordPressKit.

I've designated this a Draft PR, unless or until the associated update to WordPressKit has been properly versioned.

To test:

  • Branch should build.
  • Tests should pass.
  • "Smoke test" of network connectivity in the app should work.

Update release notes:

  • If there are user facing changes, I have added an item to RELEASE-NOTES.txt.

@ghost ghost self-assigned this Feb 25, 2019
@ghost
ghost requested a review from jklausa February 25, 2019 16:36
@ghost ghost added this to the 12.0 milestone Feb 25, 2019
@ghost

ghost commented Feb 25, 2019

Copy link
Copy Markdown
Author

@jklausa would you be willing to take a look at this?

@ghost ghost added the Network/Sync label Feb 25, 2019
@ghost
ghost marked this pull request as ready for review February 25, 2019 18:20
@ghost

ghost commented Feb 25, 2019

Copy link
Copy Markdown
Author

@jklausa please hold on this. I absorbed the change to WordPressKit that you just approved, and am now faced with a merge conflict.

In attempting to resolve said conflict, I encountered the following error:

[!] CocoaPods could not find compatible versions for pod "WordPressShared":
  In snapshot (Podfile.lock):
    WordPressShared (= 1.7.1, = 1.7.1-beta.3, ~> 1.4)

  In Podfile:
    WordPressKit (~> 2.1.1-beta.1) was resolved to 2.1.1-beta.1, which depends on
      WordPressShared (~> 1.4)

    WordPressShared (~> 1.7.1)

Due to the previous naïve CocoaPods resolver, you were using a pre-release version of `WordPressShared`, without explicitly asking for a pre-release version, which now leads to a conflict. Please decide to either use that pre-release version by adding the version requirement to your Podfile (e.g. `pod 'WordPressShared', '= 1.7.1, = 1.7.1-beta.3, ~> 1.4'`) or revert to a stable version by running `pod update WordPressShared`.

I'm afraid I might have to re-revise WordPressKit to account for the change to WordPressShared.

@ghost

ghost commented Feb 25, 2019

Copy link
Copy Markdown
Author

OK @jklausa - thanks to an assist from @jkmassel, no version increment was required here. Ready when you are!

@jklausa

jklausa commented Feb 26, 2019

Copy link
Copy Markdown
Contributor

@stevebaranski I ended up needing to roll those changes among others as part of #11129 — would you mind if we closed this and just merged #11129 instead?

@ghost

ghost commented Feb 26, 2019

Copy link
Copy Markdown
Author

Sounds good @jklausa - thank you!

@ghost

ghost commented Feb 26, 2019

Copy link
Copy Markdown
Author

Closing this issue in deference to #11129.

@ghost ghost closed this Feb 26, 2019
@ghost
ghost deleted the issue/wpkit-79-integration branch February 27, 2019 23:19
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants