Skip to content

Commit 6f5c216

Browse files
committed
lint
1 parent ef99046 commit 6f5c216

File tree

3 files changed

+25
-12
lines changed

3 files changed

+25
-12
lines changed

build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/publishing/SonatypeCentralPortalClient.kt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55

66
package aws.sdk.kotlin.gradle.publishing
77

8-
import java.io.File
9-
import java.util.Base64
10-
import java.time.Duration
118
import kotlinx.serialization.Serializable
129
import kotlinx.serialization.json.Json
13-
import kotlin.time.ExperimentalTime
1410
import okhttp3.*
11+
import okhttp3.HttpUrl.Companion.toHttpUrl
1512
import okhttp3.MediaType.Companion.toMediaType
1613
import okhttp3.RequestBody.Companion.asRequestBody
1714
import okhttp3.RequestBody.Companion.toRequestBody
18-
import okhttp3.HttpUrl.Companion.toHttpUrl
15+
import java.io.File
16+
import java.time.Duration
17+
import java.util.Base64
1918
import kotlin.time.Clock
19+
import kotlin.time.ExperimentalTime
2020

2121
/**
2222
* A client used for interacting with the Sonatype Publish Portal API
@@ -30,7 +30,10 @@ class SonatypeCentralPortalClient(
3030
.writeTimeout(Duration.ofSeconds(60))
3131
.retryOnConnectionFailure(true)
3232
.build(),
33-
private val json: Json = Json { ignoreUnknownKeys = true; prettyPrint = true }
33+
private val json: Json = Json {
34+
ignoreUnknownKeys = true
35+
prettyPrint = true
36+
},
3437
) {
3538
companion object {
3639
const val CENTRAL_PORTAL_USERNAME = "SONATYPE_CENTRAL_PORTAL_USERNAME"
@@ -127,7 +130,7 @@ class SonatypeCentralPortalClient(
127130
terminalStates: Set<String>,
128131
pollInterval: kotlin.time.Duration,
129132
timeout: kotlin.time.Duration,
130-
onStateChange: (old: String?, new: String) -> Unit = { _, _ -> }
133+
onStateChange: (old: String?, new: String) -> Unit = { _, _ -> },
131134
): StatusResponse {
132135
val deadline = Clock.System.now() + timeout
133136
var lastState: String? = null

build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/publishing/SonatypeCentralPortalPublishTask.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package aws.sdk.kotlin.gradle.publishing
27

38
import org.gradle.api.DefaultTask
49
import org.gradle.api.file.RegularFileProperty
510
import org.gradle.api.provider.Property
611
import org.gradle.api.tasks.*
712
import kotlin.time.Duration
8-
import kotlin.time.Duration.Companion.seconds
913
import kotlin.time.Duration.Companion.minutes
14+
import kotlin.time.Duration.Companion.seconds
1015

1116
/**
12-
* Publishes a bundle to Sonatype Portal and waits for completion.
17+
* Publishes a bundle to Sonatype Portal and waits for it to be validated (but not fully published).
1318
* States: PENDING, VALIDATING, VALIDATED, FAILED
1419
* https://central.sonatype.org/publish/publish-portal-api/
1520
*/

build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/publishing/SonatypeCentralPortalWaitForPublicationTask.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package aws.sdk.kotlin.gradle.publishing
27

38
import org.gradle.api.DefaultTask
@@ -14,7 +19,7 @@ import kotlin.time.Duration.Companion.seconds
1419
* Waits for a given deploymentId to enter the PUBLISHED state
1520
* https://central.sonatype.org/publish/publish-portal-api/
1621
*/
17-
abstract class SonatypeCentralPortalWaitForPublicationTask: DefaultTask() {
22+
abstract class SonatypeCentralPortalWaitForPublicationTask : DefaultTask() {
1823
@get:Input
1924
abstract val deploymentId: Property<String>
2025

@@ -47,7 +52,7 @@ abstract class SonatypeCentralPortalWaitForPublicationTask: DefaultTask() {
4752
deploymentId,
4853
setOf("PUBLISHED", "FAILED"),
4954
pollInterval.get(),
50-
timeoutDuration.get()
55+
timeoutDuration.get(),
5156
) { _, newState ->
5257
logger.lifecycle("📡 Status: $newState (deploymentId=$deploymentId)")
5358
}
@@ -63,4 +68,4 @@ abstract class SonatypeCentralPortalWaitForPublicationTask: DefaultTask() {
6368
else -> error("Unexpected terminal state: ${result.deploymentState}")
6469
}
6570
}
66-
}
71+
}

0 commit comments

Comments
 (0)