Skip to content

Remove deprecated usage of GoogleCredential. #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vanniktech merged 1 commit into from
Feb 17, 2025
+10 −12
Merged

Remove deprecated usage of GoogleCredential. #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions inapp-products/src/main/kotlin/de/belabs/appstatistics/inappproducts/store/PlayStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
@file:Suppress("DEPRECATION")

package de.belabs.appstatistics.inappproducts.store

import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
import com.google.api.client.json.gson.GsonFactory
import com.google.api.services.androidpublisher.AndroidPublisher
import com.google.api.services.androidpublisher.AndroidPublisherScopes
import com.google.api.services.androidpublisher.model.InAppProduct
import com.google.auth.http.HttpCredentialsAdapter
import com.google.auth.oauth2.GoogleCredentials
import de.belabs.appstatistics.inappproducts.App
import java.io.File

@Suppress("BlockingMethodInNonBlockingContext") internal class PlayStore(
private val credentialsFile: File,
internal class PlayStore(
credentialsFile: File,
) : Store {
private val credentials = GoogleCredential.fromStream(credentialsFile.inputStream())
private val credentials = GoogleCredentials.fromStream(credentialsFile.inputStream())
.createScoped(listOf(AndroidPublisherScopes.ANDROIDPUBLISHER))

private val androidPublisher = AndroidPublisher.Builder(GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance(), credentials)
private val androidPublisher = AndroidPublisher.Builder(GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance(), HttpCredentialsAdapter(credentials))
.setApplicationName("inapp-products")
.build()

Expand Down
9 changes: 4 additions & 5 deletions store-reviews/src/main/kotlin/de/belabs/appstatistics/storereviews/store/PlayStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
@file:Suppress("DEPRECATION")

package de.belabs.appstatistics.storereviews.store

import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
import com.google.api.client.json.gson.GsonFactory
import com.google.api.services.androidpublisher.AndroidPublisher
import com.google.api.services.androidpublisher.AndroidPublisherScopes
import com.google.auth.http.HttpCredentialsAdapter
import com.google.auth.oauth2.GoogleCredentials
import de.belabs.appstatistics.storereviews.App
import de.belabs.appstatistics.storereviews.Review
import kotlinx.datetime.Instant
Expand All @@ -15,10 +14,10 @@ import java.io.File
internal class PlayStore(
credentialsFile: File,
) : Store {
private val credentials = GoogleCredential.fromStream(credentialsFile.inputStream())
private val credentials = GoogleCredentials.fromStream(credentialsFile.inputStream())
.createScoped(listOf(AndroidPublisherScopes.ANDROIDPUBLISHER))

private val androidPublisher = AndroidPublisher.Builder(GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance(), credentials)
private val androidPublisher = AndroidPublisher.Builder(GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance(), HttpCredentialsAdapter(credentials))
.setApplicationName("store-reviews")
.build()

Expand Down
Loading