Skip to content

Commit 793803a

Browse files
authored
Remove deprecated usage of GoogleCredential. (#256)
1 parent a017859 commit 793803a

File tree

2 files changed

+10
-12
lines changed
  • inapp-products/src/main/kotlin/de/belabs/appstatistics/inappproducts/store
  • store-reviews/src/main/kotlin/de/belabs/appstatistics/storereviews/store

2 files changed

+10
-12
lines changed

inapp-products/src/main/kotlin/de/belabs/appstatistics/inappproducts/store/PlayStore.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
@file:Suppress("DEPRECATION")
2-
31
package de.belabs.appstatistics.inappproducts.store
42

5-
import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
63
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
74
import com.google.api.client.json.gson.GsonFactory
85
import com.google.api.services.androidpublisher.AndroidPublisher
96
import com.google.api.services.androidpublisher.AndroidPublisherScopes
107
import com.google.api.services.androidpublisher.model.InAppProduct
8+
import com.google.auth.http.HttpCredentialsAdapter
9+
import com.google.auth.oauth2.GoogleCredentials
1110
import de.belabs.appstatistics.inappproducts.App
1211
import java.io.File
1312

14-
@Suppress("BlockingMethodInNonBlockingContext") internal class PlayStore(
15-
private val credentialsFile: File,
13+
internal class PlayStore(
14+
credentialsFile: File,
1615
) : Store {
17-
private val credentials = GoogleCredential.fromStream(credentialsFile.inputStream())
16+
private val credentials = GoogleCredentials.fromStream(credentialsFile.inputStream())
1817
.createScoped(listOf(AndroidPublisherScopes.ANDROIDPUBLISHER))
1918

20-
private val androidPublisher = AndroidPublisher.Builder(GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance(), credentials)
19+
private val androidPublisher = AndroidPublisher.Builder(GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance(), HttpCredentialsAdapter(credentials))
2120
.setApplicationName("inapp-products")
2221
.build()
2322

store-reviews/src/main/kotlin/de/belabs/appstatistics/storereviews/store/PlayStore.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
@file:Suppress("DEPRECATION")
2-
31
package de.belabs.appstatistics.storereviews.store
42

5-
import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
63
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
74
import com.google.api.client.json.gson.GsonFactory
85
import com.google.api.services.androidpublisher.AndroidPublisher
96
import com.google.api.services.androidpublisher.AndroidPublisherScopes
7+
import com.google.auth.http.HttpCredentialsAdapter
8+
import com.google.auth.oauth2.GoogleCredentials
109
import de.belabs.appstatistics.storereviews.App
1110
import de.belabs.appstatistics.storereviews.Review
1211
import kotlinx.datetime.Instant
@@ -15,10 +14,10 @@ import java.io.File
1514
internal class PlayStore(
1615
credentialsFile: File,
1716
) : Store {
18-
private val credentials = GoogleCredential.fromStream(credentialsFile.inputStream())
17+
private val credentials = GoogleCredentials.fromStream(credentialsFile.inputStream())
1918
.createScoped(listOf(AndroidPublisherScopes.ANDROIDPUBLISHER))
2019

21-
private val androidPublisher = AndroidPublisher.Builder(GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance(), credentials)
20+
private val androidPublisher = AndroidPublisher.Builder(GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance(), HttpCredentialsAdapter(credentials))
2221
.setApplicationName("store-reviews")
2322
.build()
2423

0 commit comments

Comments
 (0)