From 9a055c774ef959b89732c872bb1e93a972679381 Mon Sep 17 00:00:00 2001 From: Guardiola31337 Date: Mon, 12 Mar 2018 14:05:13 +0100 Subject: release mapbox-android-sdk 6.0.0-SNAPSHOT --- circle.yml | 2 +- platform/android/MapboxGLAndroidSDK/build.gradle | 1 + .../com/mapbox/mapboxsdk/http/HTTPRequest.java | 4 +-- .../java/com/mapbox/mapboxsdk/maps/MapboxMap.java | 2 +- .../mapboxsdk/style/expressions/Expression.java | 36 +++++++++++----------- .../android/MapboxGLAndroidSDKTestApp/build.gradle | 1 + platform/android/build.gradle | 2 +- platform/android/gradle/dependencies.gradle | 14 +++++---- 8 files changed, 33 insertions(+), 29 deletions(-) diff --git a/circle.yml b/circle.yml index c40b6c9c11..1616cc7bdd 100644 --- a/circle.yml +++ b/circle.yml @@ -403,7 +403,7 @@ jobs: - deploy: name: Publish to Maven command: | - if [ "${CIRCLE_BRANCH}" == "release-boba" ]; then make run-android-upload-archives ; fi + if [ "${CIRCLE_BRANCH}" == "pg-mapbox-android-sdk-boba-snapshot" ]; then make run-android-upload-archives ; fi # ------------------------------------------------------------------------------ diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index f82968051d..e621157e8e 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'com.android.library' dependencies { api dependenciesList.mapboxAndroidTelemetry api dependenciesList.mapboxJavaGeoJSON + api dependenciesList.mapboxJavaCore api dependenciesList.mapboxAndroidGestures implementation dependenciesList.supportAnnotations implementation dependenciesList.supportFragmentV4 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java index ffc55fec46..ab1191c0cc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java @@ -8,6 +8,7 @@ import android.support.annotation.NonNull; import android.text.TextUtils; import android.util.Log; +import com.mapbox.android.telemetry.TelemetryUtils; import com.mapbox.mapboxsdk.BuildConfig; import com.mapbox.mapboxsdk.Mapbox; import com.mapbox.mapboxsdk.constants.MapboxConstants; @@ -30,7 +31,6 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; import okhttp3.ResponseBody; -import okhttp3.internal.Util; import timber.log.Timber; import static android.util.Log.DEBUG; @@ -224,7 +224,7 @@ class HTTPRequest implements Callback { private String getUserAgent() { if (userAgentString == null) { - userAgentString = Util.toHumanReadableAscii( + userAgentString = TelemetryUtils.toHumanReadableAscii( String.format("%s %s (%s) Android/%s (%s)", getApplicationIdentifier(), BuildConfig.MAPBOX_VERSION_STRING, diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index 45cb75b2da..2c3d06a35a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -1574,7 +1574,7 @@ public final class MapboxMap { /** *

* Sets the distance from the edges of the map view's frame to the edges of the map - * view's logical viewport. + * view's logical viewport. *

*

* When the value of this property is equal to {0,0,0,0}, viewport diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java index f6caa0b8e3..dc42dbeaaf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java @@ -18,7 +18,7 @@ import java.util.List; * The value for any layout property, paint property, or filter may be specified as an expression. * An expression defines a formula for computing the value of the property using the operators described below. * The set of expression operators provided by Mapbox GL includes: - *

+ *

* - *

+ *

*

* Expressions are represented as JSON arrays. * The first element of an expression array is a string naming the expression operator, @@ -312,7 +312,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression gt(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression(">", compareOne, compareTwo); @@ -324,7 +324,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression gt(@NonNull Number compareOne, @NonNull Number compareTwo) { return new Expression(">", literal(compareOne), literal(compareTwo)); @@ -336,7 +336,7 @@ public class Expression { * @param compareOne the first string * @param compareTwo the second string * @return expression - * @see Style specification + * @see Style specification */ public static Expression gt(@NonNull String compareOne, @NonNull String compareTwo) { return new Expression(">", literal(compareOne), literal(compareTwo)); @@ -349,7 +349,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression lt(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression("<", compareOne, compareTwo); @@ -361,7 +361,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression lt(@NonNull Number compareOne, @NonNull Number compareTwo) { return new Expression("<", literal(compareOne), literal(compareTwo)); @@ -373,7 +373,7 @@ public class Expression { * @param compareOne the first string * @param compareTwo the second string * @return expression - * @see Style specification + * @see Style specification */ public static Expression lt(@NonNull String compareOne, @NonNull String compareTwo) { return new Expression("<", literal(compareOne), literal(compareTwo)); @@ -386,7 +386,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression gte(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression(">=", compareOne, compareTwo); @@ -398,7 +398,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression gte(@NonNull Number compareOne, @NonNull Number compareTwo) { return new Expression(">=", literal(compareOne), literal(compareTwo)); @@ -410,7 +410,7 @@ public class Expression { * @param compareOne the first string * @param compareTwo the second string * @return expression - * @see Style specification + * @see Style specification */ public static Expression gte(@NonNull String compareOne, @NonNull String compareTwo) { return new Expression(">=", literal(compareOne), literal(compareTwo)); @@ -423,7 +423,7 @@ public class Expression { * @param compareOne the first expression * @param compareTwo the second expression * @return expression - * @see Style specification + * @see Style specification */ public static Expression lte(@NonNull Expression compareOne, @NonNull Expression compareTwo) { return new Expression("<=", compareOne, compareTwo); @@ -435,7 +435,7 @@ public class Expression { * @param compareOne the first number * @param compareTwo the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression lte(@NonNull Number compareOne, @NonNull Number compareTwo) { return new Expression("<=", literal(compareOne), literal(compareTwo)); @@ -447,7 +447,7 @@ public class Expression { * @param compareOne the first string * @param compareTwo the second string * @return expression - * @see Style specification + * @see Style specification */ public static Expression lte(@NonNull String compareOne, @NonNull String compareTwo) { return new Expression("<=", literal(compareOne), literal(compareTwo)); @@ -911,7 +911,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression mod(@NonNull Expression first, @NonNull Expression second) { return new Expression("%", first, second); @@ -923,7 +923,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression mod(@NonNull Number first, @NonNull Number second) { return mod(literal(first), literal(second)); @@ -935,7 +935,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression pow(@NonNull Expression first, @NonNull Expression second) { return new Expression("^", first, second); @@ -947,7 +947,7 @@ public class Expression { * @param first the first number * @param second the second number * @return expression - * @see Style specification + * @see Style specification */ public static Expression pow(@NonNull Number first, @NonNull Number second) { return pow(literal(first), literal(second)); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index 135b46e0fe..140a926d35 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -54,6 +54,7 @@ android { dependencies { api(project(':MapboxGLAndroidSDK')) implementation dependenciesList.mapboxJavaServices + implementation dependenciesList.mapboxJavaCore implementation dependenciesList.mapboxJavaTurf diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 6cd9505447..79e15dce84 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -11,10 +11,10 @@ buildscript { allprojects { repositories { + maven { url "http://oss.sonatype.org/content/repositories/snapshots/" } mavenCentral() jcenter() google() - maven { url "http://oss.sonatype.org/content/repositories/snapshots/" } } } diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index 90688f0058..e4e6ef0a17 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -8,8 +8,9 @@ ext { ] versions = [ - mapboxServices : '3.0.0-beta.3', - mapboxTelemetry: '3.0.0-beta.1', + mapboxServices : '3.0.0-20180312.203040-42', + mapboxJavaCore : '3.0.0-20180312.203017-42', + mapboxTelemetry: '4.0.0-20180312.125309-6', mapboxGestures : '0.1.0-20180228.152340-13', supportLib : '25.4.0', espresso : '3.0.1', @@ -20,17 +21,18 @@ ext { mockito : '2.10.0', robolectric : '3.5.1', timber : '4.5.1', - okhttp : '3.9.1' + okhttp : '3.10.0' ] dependenciesList = [ mapboxJavaServices : "com.mapbox.mapboxsdk:mapbox-sdk-services:${versions.mapboxServices}", - mapboxJavaGeoJSON : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${versions.mapboxServices}", + mapboxJavaCore : "com.mapbox.mapboxsdk:mapbox-sdk-core:${versions.mapboxJavaCore}", + mapboxJavaGeoJSON : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:3.0.0-20180312.203030-42", mapboxAndroidTelemetry: "com.mapbox.mapboxsdk:mapbox-android-telemetry:${versions.mapboxTelemetry}", - mapboxAndroidGestures : "com.mapbox.mapboxsdk:mapbox-android-gestures:${versions.mapboxGestures}@aar", + mapboxAndroidGestures : "com.mapbox.mapboxsdk:mapbox-android-gestures:${versions.mapboxGestures}", // for testApp - mapboxJavaTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}", + mapboxJavaTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:3.0.0-20180312.203058-42", junit : "junit:junit:${versions.junit}", mockito : "org.mockito:mockito-core:${versions.mockito}", -- cgit v1.2.1