Skip to content

Conversation

@tobrun
Copy link
Member

@tobrun tobrun commented Jun 30, 2021

PRs must be submitted under the terms of our Contributor License Agreement CLA.
Fixes: < Link to related issues that will be fixed by this pull request, if they exist >

Pull request checklist:

  • Briefly describe the changes in this PR.
  • Include before/after visuals or gifs if this PR includes visual changes.
  • Write tests for all new functionality. If tests were not written, please explain why.
  • Add example if relevant.
  • Document any changes to public APIs.
  • Apply changelog label ('breaking change', 'bug 🪲', 'build', 'docs', 'feature 🍏', 'performance ⚡', 'testing 💯') or use the label 'skip changelog'
  • Add an entry inside this element for inclusion in the mapbox-maps-android changelog: <changelog></changelog>.

Summary of changes

Rebase gone wrong before merging #332, this PR restores the generated style code.

@kiryldz
Copy link
Contributor

kiryldz commented Jun 30, 2021

@tobrun from what I see files
app/src/androidTest/java/com/mapbox/maps/testapp/annotation/UpdateAnnotationTest.kt and sdk/src/androidTest/java/com/mapbox/maps/MapIntegrationTest.kt should be also reverted. Perhaps smth else got broken, could you please go thru all the changes in https://github.com/mapbox/mapbox-maps-android/pull/332/files and validate carefully?

@tobrun
Copy link
Member Author

tobrun commented Jun 30, 2021

app/src/androidTest/java/com/mapbox/maps/testapp/annotation/UpdateAnnotationTest.kt

expected change

sdk/src/androidTest/java/com/mapbox/maps/MapIntegrationTest.kt

unexpected change and reverted

@Chaoba Chaoba merged commit cd82a6b into main Jul 1, 2021
@Chaoba Chaoba deleted the tvn-restore-style branch July 1, 2021 00:58
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.

3 participants