From 5e51d9ebd7a572c836a4eedc587bb85718b2225a Mon Sep 17 00:00:00 2001 From: Arthur Thompson Date: Tue, 22 Jun 2021 11:02:15 -0700 Subject: [PATCH 1/2] fix: GoogleCredential to GoogleCredentials --- messaging/build.gradle | 4 ++-- .../com/google/firebase/quickstart/Messaging.java | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/messaging/build.gradle b/messaging/build.gradle index 3d3615a..330afd9 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -22,6 +22,6 @@ run { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' - compile 'com.google.api-client:google-api-client:1.22.0' - compile 'com.google.code.gson:gson:2.8.1' + compile 'com.google.auth:google-auth-library-oauth2-http:0.26.0' + compile 'com.google.code.gson:gson:2.8.7' } diff --git a/messaging/src/main/java/com/google/firebase/quickstart/Messaging.java b/messaging/src/main/java/com/google/firebase/quickstart/Messaging.java index 514b5c5..9210842 100644 --- a/messaging/src/main/java/com/google/firebase/quickstart/Messaging.java +++ b/messaging/src/main/java/com/google/firebase/quickstart/Messaging.java @@ -1,6 +1,7 @@ package com.google.firebase.quickstart; import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; +import com.google.auth.oauth2.GoogleCredentials; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; @@ -43,11 +44,11 @@ public class Messaging { */ // [START retrieve_access_token] private static String getAccessToken() throws IOException { - GoogleCredential googleCredential = GoogleCredential - .fromStream(new FileInputStream("service-account.json")) - .createScoped(Arrays.asList(SCOPES)); - googleCredential.refreshToken(); - return googleCredential.getAccessToken(); + GoogleCredentials googleCredentials = GoogleCredentials + .fromStream(new FileInputStream("service-account.json")) + .createScoped(Arrays.asList(SCOPES)); + googleCredentials.refreshAccessToken(); + return googleCredentials.getAccessToken().getTokenValue(); } // [END retrieve_access_token] From 7d99e44277c2e07200c112b769b4c4b799fb0d70 Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Wed, 23 Jun 2021 05:02:16 -0400 Subject: [PATCH 2/2] Update Messaging.java --- .../src/main/java/com/google/firebase/quickstart/Messaging.java | 1 - 1 file changed, 1 deletion(-) diff --git a/messaging/src/main/java/com/google/firebase/quickstart/Messaging.java b/messaging/src/main/java/com/google/firebase/quickstart/Messaging.java index 9210842..48e1a3a 100644 --- a/messaging/src/main/java/com/google/firebase/quickstart/Messaging.java +++ b/messaging/src/main/java/com/google/firebase/quickstart/Messaging.java @@ -1,6 +1,5 @@ package com.google.firebase.quickstart; -import com.google.api.client.googleapis.auth.oauth2.GoogleCredential; import com.google.auth.oauth2.GoogleCredentials; import com.google.gson.Gson; import com.google.gson.GsonBuilder;