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

2 files changed, 0 insertions, 136 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/layers/FilterTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/layers/FilterTest.java
deleted file mode 100644
index 933bf05b39..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/layers/FilterTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.mapbox.mapboxsdk.style.layers;
-
-import org.junit.Test;
-
-import static com.mapbox.mapboxsdk.style.layers.Filter.all;
-import static com.mapbox.mapboxsdk.style.layers.Filter.any;
-import static com.mapbox.mapboxsdk.style.layers.Filter.eq;
-import static com.mapbox.mapboxsdk.style.layers.Filter.gt;
-import static com.mapbox.mapboxsdk.style.layers.Filter.gte;
-import static com.mapbox.mapboxsdk.style.layers.Filter.has;
-import static com.mapbox.mapboxsdk.style.layers.Filter.in;
-import static com.mapbox.mapboxsdk.style.layers.Filter.lt;
-import static com.mapbox.mapboxsdk.style.layers.Filter.lte;
-import static com.mapbox.mapboxsdk.style.layers.Filter.neq;
-import static com.mapbox.mapboxsdk.style.layers.Filter.none;
-import static com.mapbox.mapboxsdk.style.layers.Filter.notHas;
-import static com.mapbox.mapboxsdk.style.layers.Filter.notIn;
-import static org.junit.Assert.assertArrayEquals;
-
-/**
- * Tests for Filter
- */
-public class FilterTest {
-
-  @Test
-  public void testAll() {
-    assertArrayEquals(all().toArray(), new Object[] {"all"});
-    assertArrayEquals(
-      all(eq("key", 2), neq("key", 3)).toArray(),
-      new Object[] {"all", new Object[] {"==", "key", 2}, new Object[] {"!=", "key", 3}}
-    );
-  }
-
-  @Test
-  public void testAny() {
-    assertArrayEquals(any().toArray(), new Object[] {"any"});
-    assertArrayEquals(
-      any(eq("key", 2), neq("key", 3)).toArray(),
-      new Object[] {"any", new Object[] {"==", "key", 2}, new Object[] {"!=", "key", 3}}
-    );
-  }
-
-  @Test
-  public void testNone() {
-    assertArrayEquals(none().toArray(), new Object[] {"none"});
-    assertArrayEquals(
-      none(eq("key", 2), neq("key", 3)).toArray(),
-      new Object[] {"none", new Object[] {"==", "key", 2}, new Object[] {"!=", "key", 3}}
-    );
-  }
-
-  @Test
-  public void testHas() {
-    assertArrayEquals(has("key").toArray(), new Object[] {"has", "key"});
-  }
-
-  @Test
-  public void testHasNot() {
-    assertArrayEquals(notHas("key").toArray(), new Object[] {"!has", "key"});
-  }
-
-  @Test
-  public void testEq() {
-    assertArrayEquals(eq("key", 1).toArray(), new Object[] {"==", "key", 1});
-
-  }
-
-  @Test
-  public void testNeq() {
-    assertArrayEquals(neq("key", 1).toArray(), new Object[] {"!=", "key", 1});
-  }
-
-  @Test
-  public void testGt() {
-    assertArrayEquals(gt("key", 1).toArray(), new Object[] {">", "key", 1});
-  }
-
-  @Test
-  public void testGte() {
-    assertArrayEquals(gte("key", 1).toArray(), new Object[] {">=", "key", 1});
-  }
-
-  @Test
-  public void testLt() {
-    assertArrayEquals(lt("key", 1).toArray(), new Object[] {"<", "key", 1});
-  }
-
-  @Test
-  public void testLte() {
-    assertArrayEquals(lte("key", 1).toArray(), new Object[] {"<=", "key", 1});
-  }
-
-  @Test
-  public void testIn() {
-    assertArrayEquals(in("key", 1, 2, "Aap").toArray(), new Object[] {"in", "key", 1, 2, "Aap"});
-  }
-
-  @Test
-  public void testNotIn() {
-    assertArrayEquals(notIn("key", 1, 2, "Noot").toArray(), new Object[] {"!in", "key", 1, 2, "Noot"});
-  }
-}
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/layers/FunctionTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/layers/FunctionTest.java
deleted file mode 100644
index bac1154d62..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/layers/FunctionTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mapbox.mapboxsdk.style.layers;
-
-import com.mapbox.mapboxsdk.style.functions.Function;
-
-import org.junit.Test;
-
-import static com.mapbox.mapboxsdk.style.functions.Function.zoom;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.interval;
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.lineBlur;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotNull;
-
-/**
- * Tests Function
- */
-public class FunctionTest {
-
-  @Test
-  public void testZoomFunction() {
-    Function<Float, Float> zoomF = zoom(interval(
-      stop(1f, lineBlur(1f)),
-      stop(10f, lineBlur(20f))
-      )
-    );
-
-    assertNotNull(zoomF.toValueObject());
-    assertArrayEquals(
-      new Object[] {new Object[] {1f, 1f}, new Object[] {10f, 20f}},
-      (Object[]) zoomF.toValueObject().get("stops")
-    );
-  }
-
-}