From 40dbb13b48a28818f13ff63d4646bb37612716e4 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Fri, 19 Sep 2025 12:58:41 -0700
Subject: [PATCH] Move TokenInfo to gcpbuildcache project

This class is not used by the s3buildcache plugin

Test: ./gradlew test
---
 core/build.gradle.kts                                     | 5 -----
 .../build/gradle/gcpbuildcache/GcpStorageService.kt       | 1 -
 .../gradle/gcpbuildcache}/NetworkErrorInterceptor.kt      | 8 ++++----
 .../androidx/build/gradle/gcpbuildcache}/TokenInfo.kt     | 7 ++++---
 s3buildcache/build.gradle.kts                             | 5 -----
 5 files changed, 8 insertions(+), 18 deletions(-)
 rename {core/src/main/kotlin/androidx/build/gradle/core => gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache}/NetworkErrorInterceptor.kt (89%)
 rename {core/src/main/kotlin/androidx/build/gradle/core => gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache}/TokenInfo.kt (92%)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index ee402ec..d3c6cdf 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -21,13 +21,8 @@ plugins {
 
 dependencies {
     implementation(gradleApi())
-    implementation(platform(libs.okhttp.bom))
     api(platform(libs.kotlin.bom))
     api(libs.kotlin.stdlib)
-    implementation(libs.retrofit.core)
-    implementation(libs.retrofit.converter.gson)
-    implementation(libs.google.gson)
-    implementation(libs.okhttp)
 }
 
 kotlin {
diff --git a/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpStorageService.kt b/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpStorageService.kt
index 8b7a2bf..345552c 100644
--- a/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpStorageService.kt
+++ b/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpStorageService.kt
@@ -20,7 +20,6 @@ package androidx.build.gradle.gcpbuildcache
 import androidx.build.gradle.core.FileHandleInputStream
 import androidx.build.gradle.core.FileHandleInputStream.Companion.handleInputStream
 import androidx.build.gradle.core.StorageService
-import androidx.build.gradle.core.TokenInfoService
 import com.google.api.gax.retrying.RetrySettings
 import com.google.auth.oauth2.GoogleCredentials
 import com.google.cloud.http.HttpTransportOptions
diff --git a/core/src/main/kotlin/androidx/build/gradle/core/NetworkErrorInterceptor.kt b/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/NetworkErrorInterceptor.kt
similarity index 89%
rename from core/src/main/kotlin/androidx/build/gradle/core/NetworkErrorInterceptor.kt
rename to gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/NetworkErrorInterceptor.kt
index 98408cb..4048caf 100644
--- a/core/src/main/kotlin/androidx/build/gradle/core/NetworkErrorInterceptor.kt
+++ b/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/NetworkErrorInterceptor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
  *
  */
 
-package androidx.build.gradle.core
+package androidx.build.gradle.gcpbuildcache
 
 import okhttp3.Interceptor
 import okhttp3.Response
 import org.gradle.api.GradleException
 import java.io.IOException
 
-class NetworkErrorInterceptor : Interceptor{
+class NetworkErrorInterceptor : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val request = chain.request()
         return try {
@@ -33,4 +33,4 @@ class NetworkErrorInterceptor : Interceptor{
                     " without accessing network resources.")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/kotlin/androidx/build/gradle/core/TokenInfo.kt b/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/TokenInfo.kt
similarity index 92%
rename from core/src/main/kotlin/androidx/build/gradle/core/TokenInfo.kt
rename to gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/TokenInfo.kt
index 3bd3799..96a63fc 100644
--- a/core/src/main/kotlin/androidx/build/gradle/core/TokenInfo.kt
+++ b/gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/TokenInfo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  *
  */
 
-package androidx.build.gradle.core
+package androidx.build.gradle.gcpbuildcache
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
@@ -32,7 +32,8 @@ internal fun gson(config: GsonBuilder.() -> Unit = {}): Gson {
     config.invoke(builder)
     return builder.create()
 }
-interface TokenInfoService {
+
+internal interface TokenInfoService {
     @GET("/oauth2/v1/tokeninfo")
     fun tokenInfo(@Query("access_token") accessToken: String): Call<Unit>
 
diff --git a/s3buildcache/build.gradle.kts b/s3buildcache/build.gradle.kts
index 16154ba..d695091 100644
--- a/s3buildcache/build.gradle.kts
+++ b/s3buildcache/build.gradle.kts
@@ -27,11 +27,6 @@ dependencies {
     // Bundle core library directly as we only get to publish one jar per plugin in Gradle Plugin Portal
     bundleInside(project(":core"))
     implementation(platform(libs.amazon.bom))
-    implementation(platform(libs.okhttp.bom))
-    implementation(libs.retrofit.core)
-    implementation(libs.retrofit.converter.gson)
-    implementation(libs.google.gson)
-    implementation(libs.okhttp)
     implementation(libs.amazon.s3)
     implementation(libs.amazon.sso)
     runtimeOnly(libs.amazon.sts) {