Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Merge release-ios-v3.6.0-android-v5.1.0 to master #9170

Merged
merged 64 commits into from
Jun 2, 2017

Conversation

tobrun
Copy link
Member

@tobrun tobrun commented Jun 2, 2017

This PR merges the release-ios-v3.6.0-android-v5.1.0 back to master.

Merge conflicts for:

  • Core were applied from master.
  • MacOS were applied from release branch.
  • Android were fixed depending on change (mostly from release).

LMK if I missed something or something wasn't correctly resolved.

zugaldia and others added 30 commits May 11, 2017 09:19
* update release script to trigger builds on circleci now

* update release script to trigger builds on circleci now
Upgraded from v9 default styles to v10 wherever the developer expects to get the latest and greatest, as well as in a couple tests where it may be beneficial to ensure that we can handle a two-digit version number in the style URL.

Cherry-picked from ed54849.
MGLStyleDefaultVersion is just for Streets now. Deleted style version documentation tests because not all styles are on the same version.

Cherry-picked from ca97dd8.
Undeprecated the unversioned style URL factory methods in MGLStyle for consistency with the Android and Qt SDKs. Added warnings about using them with the runtime styling API.

Refactored mbgl::util::default_styles to track different versions for different styles.

Cherry-picked from 9e384b7.
The Styles API section of the Mapbox API Documentation site now lists Traffic Day v2 and Traffic Night v2, so this change adds those styles to all the places where styles are listed.

Also switched iosapp and macosapp to unversioned style factory methods since MGLStyleDefaultVersion is no longer applicable for all styles.

Cherry-picked from 4d6f545.
* [android] url getter on sources

* [android] fix ui test filter in makefile

* [android] - build SNAPSHOT from release branch (#8958)

* [android] - update changelog for 5.1.0-beta.2

* [android] - bump version number

* [android] - Camera change listener v2.0

* [core] allow filesource url transform reset

* [android] Update attribution wordmark (#8774)

* Update wordmark on android

* Moved attribution i icon to the right of mapbox word (in mapview preview image)

* update padding and margin

* [android] update hardcoded branch name

* revert version to 5.1.0-SNAPSHOT
Factored out redundant tile URL template documentation from the MGLRasterSource and MGLVectorSource documentation into a jazzy guide. This documentation used to live in one place, on a method on MGLTileSource, but that method had to be moved to MGLTileSource’s concrete subclasses. A jazzy guide is easier to link to, in any case.
…encies (#9046)

* [android] - bump tools and support lib version for SNAPSHOT dependencies

* revert unsupported Circle CI build tools version
* [ios] observe layout guides

* [ios] update changelog
…ved (#9025)

The annotation container view keeps an array of annotation views that is separate from the array of subviews that is a property of the UIView parent class. This removes an annotation view from that container view array when the associated annotation is removed. This avoids issue related to previously removed annotation views continuing to be involved in map view logic around annotation view selection due to taps.
boundsj and others added 11 commits May 30, 2017 13:38
* [ios, macos] Updated feedback URL

* [ios, macos] Add referrer, heading, pitch to feedback URL

* [ios, macos] Updated changelogs for feedback changes

* [ios] Vary referrer by platform
* [android] - javadoc update for 5.1.0 release

* oxford comma

* Grammar/spelling tweaks

* grammar tweak

* grammar tweak

* Grammar tweaks

* Grammar tweaks
* [android] Fix tracking mode + camera race condition (#9133)

* [android] fix tracking mode + camera race condition

* fix resetTrackingModesIfRequired bug (comparing current camera position with target camera position

* cherry pick #9133 and update CHANGELOG

* add null check to prevent null pointer exception
This commit adds `rotatesWithMap` property on `MGLAnnotationView`. This
property, when set to `YES` fixes the annotation to a map such that view
follows map's rotation angle. This is useful when user wants to display
rotation-dependent annotations (e.g. sector lights).
…/mapbox-gl-native into release-ios-v3.6.0-android-v5.1.0
@tobrun tobrun added Android Mapbox Maps SDK for Android iOS Mapbox Maps SDK for iOS labels Jun 2, 2017
@tobrun tobrun self-assigned this Jun 2, 2017
Copy link
Contributor

@fabian-guerra fabian-guerra left a comment

Choose a reason for hiding this comment

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

👍🏼

Copy link
Contributor

@Guardiola31337 Guardiola31337 left a comment

Choose a reason for hiding this comment

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

Seems legit :shipit:

@tobrun tobrun force-pushed the tvn-merge-release-to-master branch from 612122f to 3ab4cbc Compare June 2, 2017 21:10
@tobrun
Copy link
Member Author

tobrun commented Jun 2, 2017

I had to redo the merge to be able to start the travis build. Diff didn't show any changes.

@tobrun tobrun merged commit 2d039d3 into master Jun 2, 2017
@tobrun tobrun deleted the tvn-merge-release-to-master branch June 2, 2017 21:41
@1ec5
Copy link
Contributor

1ec5 commented Oct 13, 2017

This PR was squashed, so most of the commits that went into iOS SDK v3.6.0 have now been orphaned. Unlike in #9416 (comment), it’s been too long to rewrite history, so the merge commit will stand.

If you arrived at this PR via git blame, re-blame the file on the release-ios-v3.6.0-android-v5.1.0 branch, which we’ll keep around indefinitely for this purpose.

/cc @mapbox/gl @mapbox/mobile

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Android Mapbox Maps SDK for Android iOS Mapbox Maps SDK for iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.