diff options
author | âosanaâ <osana.babayan@mapbox.com> | 2018-03-16 09:54:30 -0400 |
---|---|---|
committer | “osana” <osana.babayan@mapbox.com> | 2018-03-16 10:31:11 -0400 |
commit | 9c182a81ba42f4494d4a25803d0859a9659fe1a1 (patch) | |
tree | 9cb9920b512c3a49b6cdaa943b6574e49a52be38 | |
parent | d59646fc1f80caa7420eb4ada61a5d238505c3f6 (diff) | |
download | qtlocation-mapboxgl-upstream/osana-mas-beta4-boba.tar.gz |
update to MAS3.0-beta.4upstream/osana-mas-beta4-boba
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java | 4 | ||||
-rw-r--r-- | platform/android/gradle/dependencies.gradle | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java index 5c740554cd..4a2f29b503 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java @@ -187,7 +187,7 @@ public class GeoJsonSource extends Source { * * @param geometry the GeoJSON {@link Geometry} to set */ - public void setGeoJson(Geometry<?> geometry) { + public void setGeoJson(Geometry geometry) { nativeSetGeometry(geometry); } @@ -259,7 +259,7 @@ public class GeoJsonSource extends Source { private native void nativeSetFeature(Feature feature); - private native void nativeSetGeometry(Geometry<?> geometry); + private native void nativeSetGeometry(Geometry geometry); private native Feature[] querySourceFeatures(Object[] filter); diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index 90688f0058..bf0c919986 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -8,7 +8,7 @@ ext { ] versions = [ - mapboxServices : '3.0.0-beta.3', + mapboxServices : '3.0.0-beta.4', mapboxTelemetry: '3.0.0-beta.1', mapboxGestures : '0.1.0-20180228.152340-13', supportLib : '25.4.0', |