Merge branch 'release-boba' into masterupstream/fabian-merge-v4.0.0

# Conflicts:
#	circle.yml
#	include/mbgl/style/expression/let.hpp
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/gradle/dependencies.gradle
#	platform/android/src/example_custom_layer.cpp
#	platform/android/src/geojson/point.cpp
#	platform/darwin/src/NSPredicate+MGLAdditions.mm
#	platform/darwin/test/MGLExpressionTests.mm
#	platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
#	platform/ios/Mapbox-iOS-SDK-symbols.podspec
#	platform/ios/Mapbox-iOS-SDK.podspec
#	platform/ios/app/MBXViewController.m
#	src/mbgl/renderer/layers/render_custom_layer.cpp
#	src/mbgl/style/conversion/filter.cpp
#	src/mbgl/style/expression/interpolate.cpp
#	src/mbgl/style/expression/value.cpp
#	test/style/filter.test.cpp

1 files changed, 0 insertions, 99 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stops.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stops.java
deleted file mode 100644
index af4f53c072..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/functions/stops/Stops.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.mapbox.mapboxsdk.style.functions.stops;
-
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Size;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The base class for different stops implementations
- *
- * @param <I> the input type
- * @param <O> the output type
- * @see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#types-function">The style specification</a>
- */
-public abstract class Stops<I, O> {
-
-  /**
-   * Convenience method for use in function declarations
-   *
-   * @param stops the collections of discrete stops
-   * @param <I>   the Stops input type
-   * @param <O>   the Stops output type
-   * @return the {@link Stops} implementation
-   * @see Stop#stop
-   * @see CategoricalStops
-   */
-  @SafeVarargs
-  public static <I, O> CategoricalStops<I, O> categorical(@NonNull @Size(min = 1) Stop<I, O>... stops) {
-    return new CategoricalStops<>(stops);
-  }
-
-  /**
-   * Convenience method for use in function declarations
-   *
-   * @param stops the collections of discrete stops
-   * @param <I>   the Stops input type
-   * @param <O>   the Stops output type
-   * @return the {@link Stops} implementation
-   * @see Stop#stop
-   * @see ExponentialStops
-   */
-  @SafeVarargs
-  public static <I, O> ExponentialStops<I, O> exponential(@NonNull @Size(min = 1) Stop<I, O>... stops) {
-    return new ExponentialStops<>(stops);
-  }
-
-  /**
-   * Convenience method for use in function declarations
-   *
-   * @param <T> the Stops input/output type
-   * @return the {@link IdentityStops} implementation
-   * @see Stop#stop
-   * @see IdentityStops
-   */
-  public static <T> IdentityStops<T> identity() {
-    return new IdentityStops<>();
-  }
-
-  /**
-   * Convenience method for use in function declarations
-   *
-   * @param stops the collections of discrete stops
-   * @param <I>   the Stops input type
-   * @param <O>   the Stops output type
-   * @return the {@link Stops} implementation
-   * @see Stop#stop
-   * @see IntervalStops
-   */
-  @SafeVarargs
-  public static <I, O> IntervalStops<I, O> interval(@NonNull @Size(min = 1) Stop<I, O>... stops) {
-    return new IntervalStops<>(stops);
-  }
-
-  /**
-   * INTERNAL USAGE ONLY
-   *
-   * @return the value object representation for conversion to core
-   */
-  @CallSuper
-  public Map<String, Object> toValueObject() {
-    HashMap<String, Object> map = new HashMap<>();
-    map.put("type", getTypeName());
-    return map;
-  }
-
-  /**
-   * INTERNAL USAGE ONLY
-   *
-   * @return the unique type name as a string according to the style specification
-   */
-  protected abstract String getTypeName();
-
-  @Override
-  public String toString() {
-    return getTypeName();
-  }
-}