From 134a75270095ddc08156cf3f4475bdeb04ecb110 Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Tue, 22 Feb 2022 22:43:25 +0100 Subject: [PATCH 1/2] Update version constraints (Kotlin 1.6.x) --- build.gradle.kts | 3 ++- engine/build.gradle.kts | 26 ++++++++++++++++---------- integrationtest/build.gradle.kts | 16 ++++++++-------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f66e4405..99608d25 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,8 @@ plugins { } val dependencyVersions = listOf( - "org.jetbrains:annotations:23.0.0" + "org.jetbrains:annotations:23.0.0", + "junit:junit:4.13.1" ) val dependencyGroupVersions = mapOf( diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts index a93a9313..2a47ee15 100644 --- a/engine/build.gradle.kts +++ b/engine/build.gradle.kts @@ -19,7 +19,13 @@ dependencies { implementation("org.slf4j:slf4j-api") { version { strictly("[1.7,1.8)") - prefer("1.7.32") + prefer("1.7.36") + } + } + implementation("com.squareup.moshi:moshi") { + version { + strictly("[1.12.0,1.14.0)") + prefer("1.13.0") } } listOf( @@ -35,8 +41,8 @@ dependencies { } implementation("com.squareup.okio:okio") { version { - strictly("[2.5,3)") - prefer("2.10.0") + strictly("[2.5,4)") + prefer("3.0.0") } } listOf( @@ -48,8 +54,8 @@ dependencies { ).onEach { implementation(it) { version { - strictly("[1.3,1.6)") - prefer("1.5.31") + strictly("[1.3,1.7)") + prefer("1.6.10") } } } @@ -57,12 +63,12 @@ dependencies { implementation("com.squareup.moshi:moshi:1.13.0") - implementation("org.slf4j:slf4j-api") - testImplementation("ch.qos.logback:logback-classic:[1.2,2)!!1.2.9") + implementation("org.slf4j:slf4j-api:1.7.36") + testImplementation("ch.qos.logback:logback-classic:[1.2,2)!!1.2.10") - implementation("com.squareup.okio:okio") - implementation("com.squareup.okhttp3:okhttp") - testImplementation("com.squareup.okhttp3:mockwebserver") + implementation("com.squareup.okio:okio:3.0.0") + implementation("com.squareup.okhttp3:okhttp:4.9.3") + testImplementation("com.squareup.okhttp3:mockwebserver:4.9.3") implementation("org.apache.commons:commons-compress:1.21") testImplementation("org.apache.commons:commons-lang3:3.12.0") diff --git a/integrationtest/build.gradle.kts b/integrationtest/build.gradle.kts index 9a266f6c..9555ea2a 100644 --- a/integrationtest/build.gradle.kts +++ b/integrationtest/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { implementation("org.slf4j:slf4j-api") { version { strictly("[1.7,1.8)") - prefer("1.7.32") + prefer("1.7.36") } } listOf( @@ -34,8 +34,8 @@ dependencies { } implementation("com.squareup.okio:okio") { version { - strictly("[2.5,3)") - prefer("2.10.0") + strictly("[2.5,4)") + prefer("3.0.0") } } listOf( @@ -47,17 +47,17 @@ dependencies { ).onEach { implementation(it) { version { - strictly("[1.3,1.6)") - prefer("1.5.31") + strictly("[1.3,1.7)") + prefer("1.6.10") } } } } implementation(project(":engine")) - testImplementation("com.squareup.okhttp3:okhttp") + testImplementation("com.squareup.okhttp3:okhttp:4.9.3") - testImplementation("org.slf4j:slf4j-api") - testRuntimeOnly("ch.qos.logback:logback-classic:1.2.10") + testImplementation("org.slf4j:slf4j-api:1.7.36") + testRuntimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.2.10") testImplementation("org.spockframework:spock-core:2.1-groovy-3.0") testImplementation("cglib:cglib-nodep:3.3.0") From 067d1f9dd06140d96027a3fedaa6a19493ea0150 Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Tue, 22 Feb 2022 22:45:55 +0100 Subject: [PATCH 2/2] Update TestConstants --- .../de/gesellix/docker/engine/TestConstants.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/integrationtest/src/test/groovy/de/gesellix/docker/engine/TestConstants.groovy b/integrationtest/src/test/groovy/de/gesellix/docker/engine/TestConstants.groovy index 4de452c8..737c96e2 100644 --- a/integrationtest/src/test/groovy/de/gesellix/docker/engine/TestConstants.groovy +++ b/integrationtest/src/test/groovy/de/gesellix/docker/engine/TestConstants.groovy @@ -55,9 +55,9 @@ class TestConstants { versionDetails = [ ApiVersion : { it == "1.41" }, Arch : { it == "amd64" }, - BuildTime : { it =~ "2021-11-18T\\w+" }, - GitCommit : { it == "847da18" }, - GoVersion : { it == "go1.16.9" }, + BuildTime : { it =~ "2021-12-13T\\w+" }, + GitCommit : { it == "459d0df" }, + GoVersion : { it == "go1.16.12" }, KernelVersion: { it =~ "\\d.\\d{1,2}.\\d{1,2}\\w*" }, MinAPIVersion: { it == "1.24" }, Os : { it == "windows" }, @@ -67,9 +67,9 @@ class TestConstants { versionDetails = [ ApiVersion : { it == "1.41" }, Arch : { it == "amd64" }, - BuildTime : { it =~ "2021-11-18T\\w+" }, - GitCommit : { it == "847da18" }, - GoVersion : { it == "go1.16.9" }, + BuildTime : { it =~ "2021-12-13T\\w+" }, + GitCommit : { it == "459d0df" }, + GoVersion : { it == "go1.16.12" }, KernelVersion: { it =~ "\\d.\\d{1,2}.\\d{1,2}\\w*" }, MinAPIVersion: { it == "1.12" }, Os : { it == "linux" },