Bringing dependencies up to date.

build.gradle

@@ -5,12 +5,13 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.0'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
     }
 }
 
 plugins {
-    id 'com.github.sherter.google-java-format' version '0.6'
+    id 'com.github.sherter.google-java-format' version '0.7.1'
+    id 'com.github.ben-manes.versions' version '0.20.0'
 }
 
 apply plugin: 'java'
@@ -43,18 +44,18 @@ artifacts {
 }
 
 dependencies {
-    compile 'com.google.code.gson:gson:2.8.1'
-    compile 'com.squareup.okhttp3:okhttp:3.8.1'
-    compile 'joda-time:joda-time:2.9.9'
-    compileOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.54'
-    compile 'org.slf4j:slf4j-api:1.7.25'
+    compileOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.64'
+    compile 'com.google.code.gson:gson:2.8.5'
+    compile 'com.squareup.okhttp3:okhttp:3.10.0'
+    compile 'joda-time:joda-time:2.10'
+    compile 'org.slf4j:slf4j-api:1.8.0-beta2'
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.3'
-    testCompile 'org.slf4j:slf4j-simple:1.7.25'
+    testCompile 'org.mockito:mockito-core:2.19.0'
+    testCompile 'com.squareup.okhttp3:mockwebserver:3.10.0'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.5'
+    testCompile 'org.slf4j:slf4j-simple:1.8.0-beta2'
     testCompile 'commons-lang:commons-lang:2.6'
-    testCompile 'org.json:json:20170516'
+    testCompile 'org.json:json:20180130'
 }
 
 task updateVersion(type: Copy) {

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.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip

src/main/java/com/google/maps/GaeRequestHandler.java

@@ -95,7 +95,7 @@ public <T, R extends ApiResponse<T>> PendingResult<T> handlePost(
 
   @Override
   public void shutdown() {
-    //do nothing
+    // do nothing
   }
 
   /** Builder strategy for constructing {@code GaeRequestHandler}. */

src/main/java/com/google/maps/internal/GeolocationResponseAdapter.java

@@ -74,8 +74,8 @@ public GeolocationApi.Response read(JsonReader reader) throws IOException {
     reader.beginObject(); // opening {
     while (reader.hasNext()) {
       String name = reader.nextName();
-      // two different objects could be returned a success object containing "location" and "accuracy"
-      // keys or an error object containing an "error" key
+      // two different objects could be returned a success object containing "location" and
+      // "accuracy" keys or an error object containing an "error" key
       if (name.equals("location")) {
         // we already have a parser for the LatLng object so lets use that
         response.location = latLngAdapter.read(reader);
@@ -96,7 +96,8 @@ public GeolocationApi.Response read(JsonReader reader) throws IOException {
               reader.beginObject(); // ...and each error array element is an object...
               while (reader.hasNext()) {
                 errName = reader.nextName();
-                // ...with keys "reason", "domain", "debugInfo", "location", "locationType",  and "message" (again)
+                // ...with keys "reason", "domain", "debugInfo", "location", "locationType",  and
+                // "message" (again)
                 if (errName.equals("reason")) {
                   response.reason = reader.nextString();
                 } else if (errName.equals("domain")) {

src/main/java/com/google/maps/internal/RateLimitExecutorService.java

@@ -104,12 +104,12 @@ public void execute(Runnable runnable) {
   @Override
   public void shutdown() {
     delegate.shutdown();
-    //we need this to break out of queue.take()
+    // we need this to break out of queue.take()
     execute(
         new Runnable() {
           @Override
           public void run() {
-            //do nothing
+            // do nothing
           }
         });
   }
@@ -119,12 +119,12 @@ public void run() {
   @Override
   public List<Runnable> shutdownNow() {
     List<Runnable> tasks = delegate.shutdownNow();
-    //we need this to break out of queue.take()
+    // we need this to break out of queue.take()
     execute(
         new Runnable() {
           @Override
           public void run() {
-            //do nothing
+            // do nothing
           }
         });
     return tasks;

src/main/java/com/google/maps/internal/ratelimiter/SmoothRateLimiter.java

@@ -203,15 +203,13 @@ abstract class SmoothRateLimiter extends RateLimiter {
    *       <blockquote>
    *       thresholdPermits = 0.5 * warmupPeriod / stableInterval
    *       </blockquote>
-   *
    *   <li>The time to go from maxPermits to thresholdPermits is equal to the integral of the
    *       function between thresholdPermits and maxPermits. This is the area of the pictured
    *       trapezoid, and it is equal to 0.5 * (stableInterval + coldInterval) * (maxPermits -
    *       thresholdPermits). It is also equal to warmupPeriod, so
    *       <blockquote>
    *       maxPermits = thresholdPermits + 2 * warmupPeriod / (stableInterval + coldInterval)
    *       </blockquote>
-   *
    * </ul>
    */
   static final class SmoothWarmingUp extends SmoothRateLimiter {

src/main/java/com/google/maps/model/AddressComponent.java

@@ -16,6 +16,7 @@
 package com.google.maps.model;
 
 import java.io.Serializable;
+
 /**
  * The parts of an address.
  *

src/test/java/com/google/maps/DistanceMatrixApiTest.java

@@ -74,7 +74,8 @@ public void testGetDistanceMatrixWithBasicStringParams() throws Exception {
       DistanceMatrix matrix =
           DistanceMatrixApi.getDistanceMatrix(sc.context, origins, destinations).await();
 
-      // Rows length will match the number of origin elements, regardless of whether they're routable.
+      // Rows length will match the number of origin elements, regardless of whether they're
+      // routable.
       assertEquals(8, matrix.rows.length);
       assertEquals(5, matrix.rows[0].elements.length);
       assertEquals(DistanceMatrixElementStatus.OK, matrix.rows[0].elements[0].status);

src/test/java/com/google/maps/GeoApiContextTest.java

@@ -269,8 +269,8 @@ public void testQueryParamsHaveOrderPreserved() throws Exception {
 
   @Test
   public void testToggleIfExceptionIsAllowedToRetry() throws Exception {
-    // Enqueue some error responses, although only the first should be used because the response's exception is not
-    // allowed to be retried.
+    // Enqueue some error responses, although only the first should be used because the response's
+    // exception is not allowed to be retried.
     MockResponse overQueryLimitResponse = new MockResponse();
     overQueryLimitResponse.setStatus("HTTP/1.1 400 Internal server error");
     overQueryLimitResponse.setBody(TestUtils.retrieveBody("OverQueryLimitResponse.json"));
@@ -307,7 +307,7 @@ public void testShutdown() throws InterruptedException {
     assertTrue(
         "Delay thread should start in constructor of RateLimitExecutorService",
         delayThread.isAlive());
-    //this is needed to make sure that delay thread has reached queue.take()
+    // this is needed to make sure that delay thread has reached queue.take()
     delayThread.join(10);
     context.shutdown();
     delayThread.join(10);

src/test/java/com/google/maps/internal/RateLimitExecutorServiceTest.java

@@ -79,7 +79,7 @@ public void run() {
     }
     // Check that we executed every request
     // TODO(brettmorgan): figure out where we are losing requests
-    //assertEquals(100, countTotalRequests(executedTimestamps));
+    // assertEquals(100, countTotalRequests(executedTimestamps));
 
     service.shutdown();
   }
@@ -101,7 +101,7 @@ public void testDelayThreadIsStoppedAfterShutdownIsCalled() throws InterruptedEx
     assertTrue(
         "Delay thread should start in constructor of RateLimitExecutorService",
         delayThread.isAlive());
-    //this is needed to make sure that delay thread has reached queue.take()
+    // this is needed to make sure that delay thread has reached queue.take()
     delayThread.join(10);
     service.shutdown();
     delayThread.join(10);