diff --git a/src/main/kotlin/nmcp/internal/task/deleteDirectory.kt b/src/main/kotlin/nmcp/internal/task/deleteDirectory.kt index a62cce4..f2b9b35 100644 --- a/src/main/kotlin/nmcp/internal/task/deleteDirectory.kt +++ b/src/main/kotlin/nmcp/internal/task/deleteDirectory.kt @@ -5,7 +5,7 @@ import gratatouille.tasks.GTask import java.io.File @GTask(pure = false) -fun cleanupDirectory( +internal fun cleanupDirectory( @GInternal directory: String ) { diff --git a/src/main/kotlin/nmcp/internal/task/guessComponents.kt b/src/main/kotlin/nmcp/internal/task/deploymentName.kt similarity index 100% rename from src/main/kotlin/nmcp/internal/task/guessComponents.kt rename to src/main/kotlin/nmcp/internal/task/deploymentName.kt diff --git a/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFile.kt b/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFile.kt index d5d7455..4785bba 100644 --- a/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFile.kt +++ b/src/main/kotlin/nmcp/internal/task/nmcpPublishFileByFile.kt @@ -9,7 +9,7 @@ import nmcp.transport.NmcpCredentials import nmcp.transport.publishFileByFile @GTask(pure = false) -fun nmcpPublishFileByFile( +internal fun nmcpPublishFileByFile( logger: GLogger, url: String, username: String?, diff --git a/src/main/kotlin/nmcp/internal/task/nmcpPublishWithPublisherApi.kt b/src/main/kotlin/nmcp/internal/task/nmcpPublishWithPublisherApi.kt index 046b175..429a900 100644 --- a/src/main/kotlin/nmcp/internal/task/nmcpPublishWithPublisherApi.kt +++ b/src/main/kotlin/nmcp/internal/task/nmcpPublishWithPublisherApi.kt @@ -25,7 +25,7 @@ import okio.ByteString import okio.use @GTask(pure = false) -fun nmcpPublishWithPublisherApi( +internal fun nmcpPublishWithPublisherApi( logger: GLogger, username: String?, password: String?, @@ -67,7 +67,7 @@ fun nmcpPublishWithPublisherApi( .url(url) .build() .let { - client.newCall(it).execute() + nmcpClient.newCall(it).execute() }.use { if (!it.isSuccessful) { error("Cannot deploy to maven central (status='${it.code}'): ${it.body?.string()}") @@ -171,7 +171,7 @@ private fun verifyStatus( .build() .let { try { - client.newCall(it).execute() + nmcpClient.newCall(it).execute() } catch (_: SocketTimeoutException) { return UNKNOWN_QUERY_LATER } diff --git a/src/main/kotlin/nmcp/internal/task/okhttp.kt b/src/main/kotlin/nmcp/internal/task/okhttp.kt index 28a32bf..6b74aae 100644 --- a/src/main/kotlin/nmcp/internal/task/okhttp.kt +++ b/src/main/kotlin/nmcp/internal/task/okhttp.kt @@ -3,7 +3,7 @@ package nmcp.internal.task import java.time.Duration import okhttp3.OkHttpClient -internal val client = OkHttpClient.Builder() +val nmcpClient = OkHttpClient.Builder() .connectTimeout(Duration.ofSeconds(30)) .writeTimeout(Duration.ofSeconds(30)) .readTimeout(Duration.ofSeconds(60)) diff --git a/src/main/kotlin/nmcp/transport/transport.kt b/src/main/kotlin/nmcp/transport/transport.kt index 141c198..345765d 100644 --- a/src/main/kotlin/nmcp/transport/transport.kt +++ b/src/main/kotlin/nmcp/transport/transport.kt @@ -56,7 +56,7 @@ internal class HttpTransport( private val credentials: NmcpCredentials?, private val logger: GLogger, ) : Transport { - private val client = nmcp.internal.task.client.newBuilder() + private val client = nmcp.internal.task.nmcpClient.newBuilder() .addInterceptor { chain -> val builder = chain.request().newBuilder() if (credentials != null) {