Make okHttpClient and retrofit internal

Author: gabrielfeo

src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/Api.kt

@@ -1,56 +1,23 @@
-@file:Suppress("RemoveExplicitTypeArguments")
-
 package com.gabrielfeo.gradle.enterprise.api
 
-import com.gabrielfeo.gradle.enterprise.api.auth.HttpBearerAuth
-import com.gabrielfeo.gradle.enterprise.api.infrastructure.Serializer
 import com.gabrielfeo.gradle.enterprise.api.internal.*
-import com.gabrielfeo.gradle.enterprise.api.internal.caching.CacheEnforcingInterceptor
-import com.gabrielfeo.gradle.enterprise.api.internal.caching.CacheHitLoggingInterceptor
-import com.gabrielfeo.gradle.enterprise.api.internal.caching.cache
-import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.converter.scalars.ScalarsConverterFactory
 import retrofit2.create
 
-var baseUrl: () -> String = { requireBaseUrl() }
-var accessToken: () -> String = { requireToken() }
+val api: GradleEnterpriseApi by lazy {
+    retrofit.create(GradleEnterpriseApi::class.java)
+}
 
-var maxConcurrentRequests = 30
-var maxCacheSize = 500_000_000L
-var debugLoggingEnabled = System.getenv("GRADLE_ENTERPRISE_API_DEBUG_LOGGING").toBoolean()
+fun shutdown() {
+    okHttpClient.dispatcher.executorService.shutdownNow()
+}
 
+var maxCacheSize = 500_000_000L
 val cacheablePaths: MutableList<Regex> = mutableListOf(
     """.*/api/builds/[\d\w]+/(?:gradle|maven)-attributes""".toRegex(),
 )
 
-val okHttpClient: OkHttpClient by lazy {
-    OkHttpClient.Builder()
-        .cache(cache)
-        .addInterceptor(HttpBearerAuth("bearer", accessToken()))
-        .addInterceptor(CacheHitLoggingInterceptor())
-        .addNetworkInterceptor(CacheEnforcingInterceptor(cacheablePaths))
-        .build()
-        .apply {
-            dispatcher.maxRequests = maxConcurrentRequests
-            dispatcher.maxRequestsPerHost = maxConcurrentRequests
-        }
-}
-
-val retrofit: Retrofit by lazy {
-    Retrofit.Builder()
-        .baseUrl(baseUrl())
-        .addConverterFactory(ScalarsConverterFactory.create())
-        .addConverterFactory(MoshiConverterFactory.create(Serializer.moshi))
-        .client(okHttpClient)
-        .build()
-}
-
-val api: GradleEnterpriseApi by lazy {
-    retrofit.create<GradleEnterpriseApi>()
-}
+var baseUrl: () -> String = { requireBaseUrl() }
+var accessToken: () -> String = { requireToken() }
 
-fun shutdown() {
-    okHttpClient.dispatcher.executorService.shutdownNow()
-}
+var maxConcurrentRequests = 30
+var debugLoggingEnabled = System.getenv("GRADLE_ENTERPRISE_API_DEBUG_LOGGING").toBoolean()

src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/OkHttpClient.kt

@@ -0,0 +1,23 @@
+package com.gabrielfeo.gradle.enterprise.api.internal
+
+import com.gabrielfeo.gradle.enterprise.api.accessToken
+import com.gabrielfeo.gradle.enterprise.api.auth.HttpBearerAuth
+import com.gabrielfeo.gradle.enterprise.api.cacheablePaths
+import com.gabrielfeo.gradle.enterprise.api.internal.caching.CacheEnforcingInterceptor
+import com.gabrielfeo.gradle.enterprise.api.internal.caching.CacheHitLoggingInterceptor
+import com.gabrielfeo.gradle.enterprise.api.internal.caching.cache
+import com.gabrielfeo.gradle.enterprise.api.maxConcurrentRequests
+import okhttp3.OkHttpClient
+
+val okHttpClient: OkHttpClient by lazy {
+    OkHttpClient.Builder()
+        .cache(cache)
+        .addInterceptor(HttpBearerAuth("bearer", accessToken()))
+        .addInterceptor(CacheHitLoggingInterceptor())
+        .addNetworkInterceptor(CacheEnforcingInterceptor(cacheablePaths))
+        .build()
+        .apply {
+            dispatcher.maxRequests = maxConcurrentRequests
+            dispatcher.maxRequestsPerHost = maxConcurrentRequests
+        }
+}

src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/Retrofit.kt

@@ -0,0 +1,16 @@
+package com.gabrielfeo.gradle.enterprise.api.internal
+
+import com.gabrielfeo.gradle.enterprise.api.baseUrl
+import com.gabrielfeo.gradle.enterprise.api.infrastructure.Serializer
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.converter.scalars.ScalarsConverterFactory
+
+val retrofit: Retrofit by lazy {
+    Retrofit.Builder()
+        .baseUrl(baseUrl())
+        .addConverterFactory(ScalarsConverterFactory.create())
+        .addConverterFactory(MoshiConverterFactory.create(Serializer.moshi))
+        .client(okHttpClient)
+        .build()
+}