[ios, macos] Mark deprecated methods as unavailable #11205

jmkiley · 2018-02-14T18:25:41Z

Marked methods/properties as unavailable.
Removed the implementation code.
Remove related tests.
Clean up comments.

friedbunny · 2018-02-14T22:22:32Z

platform/darwin/src/MGLAccountManager.m

@@ -55,7 +55,7 @@ + (instancetype)sharedManager {
 }

 + (BOOL)mapboxMetricsEnabledSettingShownInApp {
-    NSLog(@"mapboxMetricsEnabledSettingShownInApp is no longer necessary; the Mapbox Maps SDK for iOS has changed to always provide a telemetry setting in-app.");
+    [NSException raise:NSInternalInconsistencyException format:@"Telemetry settings are now always shown in the ℹ️ menu."];


Can you say more about why we shouldn’t delete this implementation?

friedbunny · 2018-02-14T22:24:44Z

platform/ios/src/MGLMapView.h

-
- @deprecated Call the relevant class method of `MGLStyle` for the URL of a
-    particular default style.
+ :nodoc: bundledStyleURLs has been removed.


I think it’s safe to get rid of any external comments on unavailable() bits.

friedbunny · 2018-02-14T22:25:17Z

platform/ios/src/MGLMapView.h

@@ -284,16 +281,16 @@ MGL_EXPORT IB_DESIGNABLE
 - (IBAction)showAttribution:(id)sender;

 /// :nodoc: Support for style classes has been removed. This property always returns an empty array.


These comments are no longer accurate — let’s axe ‘em.

friedbunny · 2018-02-14T22:31:04Z

platform/darwin/src/MGLStyle.h

@@ -89,7 +89,7 @@ MGL_EXPORT

 Emerald is a tactile style with subtle textures and dramatic hillshading.


Ditto to removing these obsolete comments.

1ec5

Let’s add a blurb to both changelogs referring to the removal of these symbols. Something like:

Removed methods, properties, and constants that had been deprecated as of v3.7.x.

1ec5 · 2018-02-15T07:06:28Z

platform/darwin/src/MGLStyle.mm

-    return MGLStyleURL_hybrid;
-}
-
-// Emerald is no longer getting new versions as a default style, so the current version is hard-coded here.


Goodbye Emerald. 😢

1ec5 · 2018-02-15T07:16:34Z

1096388 removes Traffic Day and Traffic Night menu items from macosapp.

jmkiley · 2018-02-15T18:30:10Z

I am currently working on getting a couple of tests passing. I'm not sure if I should remove the trafficDay and trafficNight styles from default_styles.hpp, since other platforms still seem to use those styles. Another option is to modify the tests so they pass until we add the navigation styles or remove the unavailable styles from core.

friedbunny · 2018-02-15T19:30:31Z

platform/darwin/test/MGLStyleTests.mm

@@ -100,15 +100,6 @@ - (void)testVersionedStyleURLs {
    XCTAssertEqualObjects([MGLStyle satelliteStreetsStyleURLWithVersion:99].absoluteString,
                          @"mapbox://styles/mapbox/satellite-streets-v99");
 #pragma clang diagnostic push


The pushes and pops can be removed, too — they served to limit the scope of the ignored warnings.

1ec5 · 2018-02-15T23:56:54Z

I am currently working on getting a couple of tests passing. I'm not sure if I should remove the trafficDay and trafficNight styles from default_styles.hpp, since other platforms still seem to use those styles. Another option is to modify the tests so they pass until we add the navigation styles or remove the unavailable styles from core.

mbgl::util::default_styles::orderedStyles is used by the GLFW application and the Qt SDK. I think it’d be reasonable to remove them from orderedStyles. After all, they’ve been superseded by the Navigation Guidance Day/Night v2 styles, even if the latter styles aren’t currently listed.

/cc @mapbox/qt

jmkiley · 2018-02-16T01:52:20Z

Without the declarations in default_styles.hpp, the tests fail here. Currently, the regex does not check whether styleURLs are unavailable. I can update that test tomorrow to filter out the unavailable styles.

jmkiley · 2018-02-16T19:19:28Z

My current solution is to check whether a style's name contains traffic. I wasn't able to get an approach that checks for the unavailable flag working.

jmkiley added 3 commits February 13, 2018 11:44

[ios, macos] initial cleaning up

2e05976

[ios, macos]Marked more methods as unavailable

15c222c

[ios] removed styleClasses code

b872753

jmkiley added iOS Mapbox Maps SDK for iOS macOS Mapbox Maps SDK for macOS SEMVER-MAJOR Requires a major release according to Semantic Versioning rules in progress labels Feb 14, 2018

jmkiley added this to the ios-v4.0.0 milestone Feb 14, 2018

jmkiley self-assigned this Feb 14, 2018

jmkiley requested review from friedbunny and 1ec5 February 14, 2018 18:25

friedbunny reviewed Feb 14, 2018

View reviewed changes

1ec5 approved these changes Feb 15, 2018

View reviewed changes

[macos] Removed traffic styles from menu, toolbar

1096388

jmkiley added 2 commits February 15, 2018 10:06

[ios, macos] Removed comments

a1df94a

[ios, macos] removed styleclasses test

d369488

[ios, macos] updated changelogs

fd3a270

friedbunny reviewed Feb 15, 2018

View reviewed changes

[ios, macos] removed unavailable styles from default_styles.hpp

9096153

jmkiley added 2 commits February 16, 2018 11:14

[ios, macos] check whether the style name contains traffic

1dedad5

[ios, macos] whitespace

ce523c0

jmkiley and others added 2 commits February 16, 2018 12:40

Merge branch 'release-boba' into jmkiley-mark-unavailable

d583cab

[ios, macos] removed style classes

ee0027c

jmkiley merged commit 9459cf6 into release-boba Feb 17, 2018

jmkiley deleted the jmkiley-mark-unavailable branch February 17, 2018 00:20

jmkiley mentioned this pull request Feb 17, 2018

Mark deprecated methods as unavailable #10735

Closed

friedbunny mentioned this pull request Apr 13, 2018

[ios] Remove more deprecated bits for release-boba #11681

Merged

friedbunny mentioned this pull request Jun 25, 2019

[ios] Remove previously deprecated unavailable methods and properties #15000

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ios, macos] Mark deprecated methods as unavailable #11205

[ios, macos] Mark deprecated methods as unavailable #11205

jmkiley commented Feb 14, 2018 •

edited

Loading

friedbunny Feb 14, 2018

friedbunny Feb 14, 2018

friedbunny Feb 14, 2018

friedbunny Feb 14, 2018

1ec5 left a comment

1ec5 Feb 15, 2018

1ec5 commented Feb 15, 2018

jmkiley commented Feb 15, 2018 •

edited

Loading

friedbunny Feb 15, 2018 •

edited

Loading

1ec5 commented Feb 15, 2018

jmkiley commented Feb 16, 2018

jmkiley commented Feb 16, 2018

		@@ -284,16 +281,16 @@ MGL_EXPORT IB_DESIGNABLE
		- (IBAction)showAttribution:(id)sender;

		/// :nodoc: Support for style classes has been removed. This property always returns an empty array.

		@@ -89,7 +89,7 @@ MGL_EXPORT

		Emerald is a tactile style with subtle textures and dramatic hillshading.

[ios, macos] Mark deprecated methods as unavailable #11205

[ios, macos] Mark deprecated methods as unavailable #11205

Conversation

jmkiley commented Feb 14, 2018 • edited Loading

friedbunny Feb 14, 2018

Choose a reason for hiding this comment

friedbunny Feb 14, 2018

Choose a reason for hiding this comment

friedbunny Feb 14, 2018

Choose a reason for hiding this comment

friedbunny Feb 14, 2018

Choose a reason for hiding this comment

1ec5 left a comment

Choose a reason for hiding this comment

1ec5 Feb 15, 2018

Choose a reason for hiding this comment

1ec5 commented Feb 15, 2018

jmkiley commented Feb 15, 2018 • edited Loading

friedbunny Feb 15, 2018 • edited Loading

Choose a reason for hiding this comment

1ec5 commented Feb 15, 2018

jmkiley commented Feb 16, 2018

jmkiley commented Feb 16, 2018

jmkiley commented Feb 14, 2018 •

edited

Loading

jmkiley commented Feb 15, 2018 •

edited

Loading

friedbunny Feb 15, 2018 •

edited

Loading