Skip to content

Commit 5851953

Browse files
authored
[Cherry-pick] Increase Maven Upload socket timeouts (#5490)
For releases after 1.10.0-beta02 ## Release Notes #5486 #5488
2 parents 2540b97 + 9be701d commit 5851953

2 files changed

Lines changed: 20 additions & 9 deletions

File tree

ci/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/DownloadFromSpaceTask.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ abstract class DownloadFromSpaceMavenRepoTask : DefaultTask() {
3434
val groupUrl = module.groupId.replace(".", "/")
3535

3636
val filesListingDocument =
37-
Jsoup.connect("${spaceRepoUrl.get()}/$groupUrl/${module.artifactId}/${module.version}/").get()
37+
Jsoup.connect("${spaceRepoUrl.get()}/$groupUrl/${module.artifactId}/${module.version}/")
38+
.timeout(180_000)
39+
.get()
3840
val downloadableFiles = HashMap<String, URL>()
3941
for (a in filesListingDocument.select("#contents > a")) {
4042
val href = a.attributes().get("href")

ci/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SpaceApiClient.kt

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ package org.jetbrains.compose.internal.publishing.utils
77

88
import io.ktor.client.*
99
import io.ktor.client.engine.okhttp.*
10+
import io.ktor.client.plugins.*
1011
import kotlinx.coroutines.runBlocking
1112
import space.jetbrains.api.runtime.*
13+
import space.jetbrains.api.runtime.SpaceAuth.ClientCredentials
1214
import space.jetbrains.api.runtime.resources.projects
13-
import space.jetbrains.api.runtime.types.*
15+
import space.jetbrains.api.runtime.types.PackageData
16+
import space.jetbrains.api.runtime.types.PackageRepositoryIdentifier
17+
import space.jetbrains.api.runtime.types.ProjectIdentifier
1418

1519
internal class SpaceApiClient(
1620
private val serverUrl: String,
@@ -48,13 +52,18 @@ internal class SpaceApiClient(
4852
}
4953
}
5054

51-
private fun withSpaceClient(fn: suspend SpaceHttpClientWithCallContext.() -> Unit) {
55+
private fun withSpaceClient(fn: suspend SpaceClient.() -> Unit) {
5256
runBlocking {
53-
HttpClient(OkHttp).use { client ->
54-
val space = SpaceHttpClient(client).withServiceAccountTokenSource(
55-
serverUrl = serverUrl,
56-
clientId = clientId,
57-
clientSecret = clientSecret
57+
HttpClient(OkHttp) {
58+
configureKtorClientForSpace()
59+
install(HttpTimeout) {
60+
socketTimeoutMillis = 180_000
61+
}
62+
}.use { client ->
63+
val space = SpaceClient(
64+
ktorClient = client,
65+
appInstance = SpaceAppInstance(clientId, clientSecret, serverUrl),
66+
auth = ClientCredentials(PermissionScope.fromString("**"))
5867
)
5968
space.fn()
6069
}
@@ -80,7 +89,7 @@ internal class SpaceApiClient(
8089
}
8190
}
8291

83-
private suspend fun SpaceHttpClientWithCallContext.forEachPackage(
92+
private suspend fun SpaceClient.forEachPackage(
8493
projectId: ProjectIdentifier,
8594
repoId: PackageRepositoryIdentifier,
8695
fn: suspend (PackageData) -> Unit

0 commit comments

Comments
 (0)