Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down