From 84c16579422668bf91e603f7645712bec808ce6b Mon Sep 17 00:00:00 2001 From: tobrun Date: Fri, 18 Jan 2019 15:17:04 +0100 Subject: [PATCH 1/2] [android] - update gradle tools version, update CI image --- build.gradle | 2 +- circle.yml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 007a7ce98..bb1bb44d8 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { dependencies.create(pluginDependencies.checkstyle) { transitive = false } - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.3.0' classpath pluginDependencies.errorprone classpath pluginDependencies.sonarqube classpath pluginDependencies.buildConfig diff --git a/circle.yml b/circle.yml index b0ad895da..d5184884a 100644 --- a/circle.yml +++ b/circle.yml @@ -9,7 +9,7 @@ jobs: build: working_directory: ~/code docker: - - image: mbgl/de3c86c2ff:android-ndk-r16 + - image: mbgl/android-ndk-r19:8e91a7ebab environment: JVM_OPTS: -Xmx3200m BUILDTYPE: Debug @@ -54,7 +54,7 @@ jobs: only: - master docker: - - image: mbgl/de3c86c2ff:android-ndk-r16 + - image: mbgl/android-ndk-r19:8e91a7ebab working_directory: ~/code environment: environment: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ada12e6c2..dd938637f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip From a525f56ffb48c777f7d9c4912fc0d0d99fd3f4bd Mon Sep 17 00:00:00 2001 From: tobrun Date: Fri, 18 Jan 2019 16:08:50 +0100 Subject: [PATCH 2/2] fix javadoc issues --- .../api/directions/v5/models/LegStep.java | 15 +++++++------ .../geocoding/v5/models/CarmenFeature.java | 22 ++++++++++--------- .../v5/models/GeocodingResponse.java | 2 +- .../java/com/mapbox/turf/TurfConstants.java | 6 ++--- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegStep.java b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegStep.java index a32dc0a1a..17d629d77 100644 --- a/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegStep.java +++ b/services-directions/src/main/java/com/mapbox/api/directions/v5/models/LegStep.java @@ -65,13 +65,14 @@ public static Builder builder() { public abstract String name(); /** - * Any road designations associated with the road or path leading from this step’s maneuver to the - * next step’s maneuver. Optionally included, if data is available. If multiple road designations - * are associated with the road, they are separated by semicolons. A road designation typically - * consists of an alphabetic network code (identifying the road type or numbering system), a space - * or hyphen, and a route number. You should not assume that the network code is globally unique: - * for example, a network code of “NH” may appear on a “National Highway” or “New Hampshire”. - * Moreover, a route number may not even uniquely identify a road within a given network. + * Any road designations associated with the road or path leading from this step's + * maneuver to the next step's maneuver. Optionally included, if data is available. + * If multiple road designations are associated with the road, they are separated by semicolons. + * A road designation typically consists of an alphabetic network code (identifying the road type + * or numbering system), a space or hyphen, and a route number. You should not assume that + * the network code is globally unique: for example, a network code of "NH" may appear + * on a "National Highway" or "New Hampshire". Moreover, a route number may + * not even uniquely identify a road within a given network. * * @return String with reference number or code of the way along which the travel proceeds. * Optionally included, if data is available. diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java index 3c2e8a497..a2bf0da00 100644 --- a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java +++ b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/CarmenFeature.java @@ -241,8 +241,9 @@ public Point center() { /** * A string analogous to the {@link #text()} field that more closely matches the query than - * results in the specified language. For example, querying "Köln, Germany" with language set to - * English might return a feature with the {@link #text()} "Cologne" and this would be "Köln". + * results in the specified language. For example, querying "Köln, Germany" with + * language set to English might return a feature with the {@link #text()} "Cologne" + * and this would be "Köln". * * @return a string containing the matching text * @since 2.2.0 @@ -253,9 +254,9 @@ public Point center() { /** * A string analogous to the {@link #placeName()} field that more closely matches the query than - * results in the specified language. For example, querying "Köln, Germany" with language set to - * English might return a feature with the {@link #placeName()} "Cologne, Germany" and this would - * return "Köln, North Rhine-Westphalia, Germany". + * results in the specified language. For example, querying "Köln, Germany" with language + * set to English might return a feature with the {@link #placeName()} "Cologne, Germany" + * and this would return "Köln, North Rhine-Westphalia, Germany". * * @return a string containing the matching place name * @since 2.2.0 @@ -452,8 +453,9 @@ public abstract static class Builder { /** * A string analogous to the {@link #text()} field that more closely matches the query than - * results in the specified language. For example, querying "Köln, Germany" with language set to - * English might return a feature with the {@link #text()} "Cologne" and this would be "Köln". + * results in the specified language. For example, querying "Köln, Germany" with language + * set to English might return a feature with the {@link #text()} "Cologne" and this + * would be "Köln". * * @param matchingText a string containing the matching text * @return this builder for chaining options together @@ -463,9 +465,9 @@ public abstract static class Builder { /** * A string analogous to the {@link #placeName()} field that more closely matches the query than - * results in the specified language. For example, querying "Köln, Germany" with language set to - * English might return a feature with the {@link #placeName()} "Cologne, Germany" and this - * would return "Köln, North Rhine-Westphalia, Germany". + * results in the specified language. For example, querying "Köln, Germany" with language + * set to English might return a feature with the {@link #placeName()} "Cologne, Germany" + * and this would return "Köln, North Rhine-Westphalia, Germany". * * @param matchingPlaceName a string containing the matching place name * @return this builder for chaining options together diff --git a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java index c2499c428..c269d0541 100644 --- a/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java +++ b/services-geocoding/src/main/java/com/mapbox/api/geocoding/v5/models/GeocodingResponse.java @@ -131,7 +131,7 @@ public String toJson() { } /** - * Gson TYPE adapter for parsing Gson t«o this class. + * Gson TYPE adapter for parsing Gson to this class. * * @param gson the built {@link Gson} object * @return the TYPE adapter for this class diff --git a/services-turf/src/main/java/com/mapbox/turf/TurfConstants.java b/services-turf/src/main/java/com/mapbox/turf/TurfConstants.java index c5a4691d3..006af5149 100644 --- a/services-turf/src/main/java/com/mapbox/turf/TurfConstants.java +++ b/services-turf/src/main/java/com/mapbox/turf/TurfConstants.java @@ -74,9 +74,9 @@ private TurfConstants() { public static final String UNIT_DEGREES = "degrees"; /** - * The inch (abbreviation: in or ″) is a unit of length in the (British) imperial and United - * States customary systems of measurement now formally equal to  1/36th yard but usually - * understood as  1/12th of a foot. + * The inch (abbreviation: in or ") is a unit of length in the (British) imperial and United + * States customary systems of measurement now formally equal to 1/36th yard but usually + * understood as 1/12th of a foot. * * @since 1.2.0 */