ConnectionMaster · pull · Jan 28, 2021 · Jan 28, 2021 · Jan 28, 2021 · Jan 28, 2021
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
@@ -1,6 +1,4 @@
 assign_issues:
   - arriolac
-  - jpoehnelt
 assign_prs:
   - arriolac
-  - jpoehnelt
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,6 +21,7 @@ on:
       - '*'
   repository_dispatch:
     types: [publish]
+  workflow_dispatch:
 
 jobs:
   publish:
@@ -36,8 +37,10 @@ jobs:
         echo $GPG_KEY_ARMOR | base64 --decode > ./release.asc
         gpg --quiet --output $GITHUB_WORKSPACE/release.gpg --dearmor ./release.asc
 
+        SONATYPE_PASSWORD_ESCAPED=$(printf '%s\n' "$SONATYPE_PASSWORD" | sed -e 's/[\/&]/\\&/g')
         sed -i -e "s,sonatypeUsername=,sonatypeUsername=$SONATYPE_USERNAME,g" gradle.properties
-        sed -i -e "s,sonatypePassword=,sonatypePassword=$SONATYPE_PASSWORD,g" gradle.properties
+        sed -i -e "s,sonatypePassword=,sonatypePassword=$SONATYPE_PASSWORD_ESCAPED,g" gradle.properties
+        sed -i -e "s,githubPassword=,githubPassword=$GITHUB_PASSWORD,g" gradle.properties
         sed -i -e "s,signing.keyId=,signing.keyId=$GPG_KEY_ID,g" gradle.properties
         sed -i -e "s,signing.password=,signing.password=$GPG_PASSWORD,g" gradle.properties
         sed -i -e "s,signing.secretKeyRingFile=,signing.secretKeyRingFile=$GITHUB_WORKSPACE/release.gpg,g" gradle.properties
@@ -46,5 +49,6 @@ jobs:
         GPG_KEY_ARMOR: "${{ secrets.SYNCED_GPG_KEY_ARMOR }}"
         GPG_KEY_ID: ${{ secrets.SYNCED_GPG_KEY_ID }}
         GPG_PASSWORD: ${{ secrets.SYNCED_GPG_KEY_PASSWORD }}
-        SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-        SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+        SONATYPE_PASSWORD: '${{ secrets.SYNCED_SONATYPE_PASSWORD }}'
+        SONATYPE_USERNAME: ${{ secrets.SYNCED_SONATYPE_USERNAME }}
+        GITHUB_PASSWORD: '${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}'
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,6 @@ apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
 apply plugin: 'com.github.sherter.google-java-format'
 
-archivesBaseName = 'google-maps-services'
 group = 'com.google.maps'
 sourceCompatibility = 1.8
 
@@ -109,6 +108,8 @@ jacocoTestReport {
     }
 }
 
+ext.artifactId = 'google-maps-services'
+
 publishing {
     publications {
         MapsJavaUtils(MavenPublication) {
@@ -157,10 +158,16 @@ publishing {
                 }
             }
             groupId group
-            artifactId 'google-maps-services'
+            artifactId project.ext.artifactId
             version version
             from components.java
         }
+        gpr(MavenPublication) {
+            groupId group
+            artifactId project.ext.artifactId
+            version version
+            from(components.java)
+        }
     }
     repositories {
         maven {
@@ -170,6 +177,14 @@ publishing {
                 password sonatypePassword
             }
         }
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/googlemaps/google-maps-services-java")
+            credentials {
+                username = 'googlemaps-bot'
+                password = githubPassword
+            }
+        }
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=0.15.4
+version=0.18.0
 
 # variables required to allow build.gradle to parse,
 # override in ~/.gradle/gradle.properties
@@ -8,3 +8,5 @@ signing.secretKeyRingFile=
 
 sonatypeUsername=
 sonatypePassword=
+
+githubPassword=
diff --git a/src/main/java/com/google/maps/errors/ApiException.java b/src/main/java/com/google/maps/errors/ApiException.java
@@ -49,7 +49,7 @@ public static ApiException from(String status, String errorMessage) {
     } else if ("NOT_FOUND".equals(status)) {
       return new NotFoundException(errorMessage);
     } else if ("OVER_QUERY_LIMIT".equals(status)) {
-      if ("You have exceeded your daily request quota for this API. If you did not set a custom daily request quota, verify your project has an active billing account."
+      if ("You have exceeded your daily request quota for this API. If you did not set a custom daily request quota, verify your project has an active billing account: http://g.co/dev/maps-no-account"
           .equalsIgnoreCase(errorMessage)) {
         return new OverDailyLimitException(errorMessage);
       }

diff --git a/src/main/java/com/google/maps/internal/GaePendingResult.java b/src/main/java/com/google/maps/internal/GaePendingResult.java
@@ -41,6 +41,7 @@
 import com.google.maps.model.PlaceDetails.Review.AspectRating.RatingType;
 import com.google.maps.model.PriceLevel;
 import com.google.maps.model.TravelMode;
+import com.google.maps.model.VehicleType;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.time.Instant;
@@ -197,6 +198,7 @@ private T parseResponseInternal(GaePendingResult<T, R> request, HTTPResponse res
             .registerTypeAdapter(TravelMode.class, new SafeEnumAdapter<>(TravelMode.UNKNOWN))
             .registerTypeAdapter(LocationType.class, new SafeEnumAdapter<>(LocationType.UNKNOWN))
             .registerTypeAdapter(RatingType.class, new SafeEnumAdapter<>(RatingType.UNKNOWN))
+            .registerTypeAdapter(VehicleType.class, new SafeEnumAdapter<>(VehicleType.OTHER))
             .registerTypeAdapter(DayOfWeek.class, new DayOfWeekAdapter())
             .registerTypeAdapter(PriceLevel.class, new PriceLevelAdapter())
             .registerTypeAdapter(Instant.class, new InstantAdapter())

diff --git a/src/main/java/com/google/maps/internal/OkHttpPendingResult.java b/src/main/java/com/google/maps/internal/OkHttpPendingResult.java
@@ -35,6 +35,7 @@
 import com.google.maps.model.PlaceDetails.Review.AspectRating.RatingType;
 import com.google.maps.model.PriceLevel;
 import com.google.maps.model.TravelMode;
+import com.google.maps.model.VehicleType;
 import java.io.IOException;
 import java.time.Instant;
 import java.time.LocalTime;
@@ -280,6 +281,8 @@ private T parseResponseInternal(OkHttpPendingResult<T, R> request, Response resp
                 LocationType.class, new SafeEnumAdapter<LocationType>(LocationType.UNKNOWN))
             .registerTypeAdapter(
                 RatingType.class, new SafeEnumAdapter<RatingType>(RatingType.UNKNOWN))
+            .registerTypeAdapter(
+                VehicleType.class, new SafeEnumAdapter<VehicleType>(VehicleType.OTHER))
             .registerTypeAdapter(DayOfWeek.class, new DayOfWeekAdapter())
             .registerTypeAdapter(PriceLevel.class, new PriceLevelAdapter())
             .registerTypeAdapter(Instant.class, new InstantAdapter())

diff --git a/src/main/java/com/google/maps/model/VehicleType.java b/src/main/java/com/google/maps/model/VehicleType.java
@@ -47,6 +47,9 @@ public enum VehicleType {
   /** High speed train. */
   HIGH_SPEED_TRAIN,
 
+  /** Long distance train. */
+  LONG_DISTANCE_TRAIN,
+
   /** Bus. */
   BUS,