Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump de.gesellix:docker-remote-api-model-1-41 from 2024-06-09T22-35-00 to 2024-07-23T23-55-00 #493

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions api-client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@ dependencies {
}
implementation("de.gesellix:docker-remote-api-model-1-41") {
version {
strictly("[2023-10-01T01-01-01,)")
strictly("[2024-01-01T01-01-01,)")
}
}
implementation("de.gesellix:docker-engine") {
version {
strictly("[2023-10-01T01-01-01,)")
strictly("[2024-01-01T01-01-01,)")
}
}
implementation("de.gesellix:docker-filesocket") {
version {
strictly("[2023-09-30T01-01-01,)")
strictly("[2024-01-01T01-01-01,)")
}
}
implementation("org.slf4j:slf4j-api") {
Expand All @@ -69,7 +69,7 @@ dependencies {
implementation("com.squareup.moshi:moshi:1.15.1")
implementation("com.squareup.okhttp3:okhttp:4.12.0")
// implementation("com.squareup.okhttp3:logging-interceptor:[4.9,5)!!4.11.0")
implementation("de.gesellix:docker-remote-api-model-1-41:2024-06-09T22-35-00")
implementation("de.gesellix:docker-remote-api-model-1-41:2024-07-23T23-55-00")
implementation("de.gesellix:docker-engine:2024-07-23T22-45-00")
implementation("de.gesellix:docker-filesocket:2024-07-23T22-35-00")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ open class ApiClient(
return requestStream(request, client)
}

protected inline fun requestFrames(requestConfig: RequestConfig, expectMultiplexedResponse: Boolean = false): ApiInfrastructureResponse<Frame> {
protected fun requestFrames(requestConfig: RequestConfig, expectMultiplexedResponse: Boolean = false): ApiInfrastructureResponse<Frame> {
val engineRequest = EngineRequest(requestConfig.method, requestConfig.path).also {
it.headers = requestConfig.headers
it.query = requestConfig.query
Expand Down Expand Up @@ -302,7 +302,7 @@ open class ApiClient(
}
}

protected inline fun requestFrames(request: Request, client: OkHttpClient, expectMultiplexedResponse: Boolean = false): ApiInfrastructureResponse<Frame> {
protected fun requestFrames(request: Request, client: OkHttpClient, expectMultiplexedResponse: Boolean = false): ApiInfrastructureResponse<Frame> {
val response = client.newCall(request).execute()
val mediaType = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.getDefault())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ inline fun <reified T : Any?> ResponseBody?.consumeStream(mediaType: String?): F
}
}

inline fun ResponseBody?.consumeFrames(mediaType: String?, expectMultiplexedResponse: Boolean = false): Flow<Frame> {
fun ResponseBody?.consumeFrames(mediaType: String?, expectMultiplexedResponse: Boolean = false): Flow<Frame> {
if (this == null) {
return emptyFlow()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
@DockerEngineAvailable
class ImageApiIntegrationTest {

private static Logger log = LoggerFactory.getLogger(ImageApiIntegrationTest.class);
private static final Logger log = LoggerFactory.getLogger(ImageApiIntegrationTest.class);

@InjectDockerClient
private EngineApiClient engineApiClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public void systemPingHead() {
@Test
public void systemVersion() {
SystemVersion systemVersion = systemApi.systemVersion();
assertTrue(asList("1.42", "1.43", "1.44").contains(systemVersion.getApiVersion()));
assertTrue(asList("1.42", "1.43", "1.44", "1.45").contains(systemVersion.getApiVersion()));
}

static class SystemEventsCallback implements StreamCallback<EventMessage> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public TestImage(EngineApiClient engineApiClient) {

this.useWindowsContainer = Objects.requireNonNull(engineApiClient.getSystemApi().systemVersion().getOs()).equalsIgnoreCase("windows");
this.repository = "gesellix/echo-server";
this.tag = "2023-12-19T09-50-00";
this.tag = "2024-07-28T18-30-00";

// TODO consider NOT calling prepare inside the constructor
prepare();
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ val dependencyVersions = listOf(
)

val dependencyVersionsByGroup = mapOf(
"org.junit.platform" to "1.10.1",
"org.junit.platform" to "1.10.3",
)

subprojects {
Expand Down
Loading