Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gesellix/docker-client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b2e14dfd05d48452323c59d8c4f85a437320cd4e
Choose a base ref
..
head repository: gesellix/docker-client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a9e31a6b3ca5eee5243d79b45794986f7bd4107b
Choose a head ref
11 changes: 3 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,8 @@ jobs:
os:
- ubuntu-latest
- windows-latest
- macos-latest
# pinned to macos-13 due to https://github.com/actions/runner-images/issues/9254
- macos-13
java:
- 8
- 17
@@ -40,19 +41,13 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: Install Docker on macOS
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos-13'
uses: douglascamata/setup-docker-macos-action@v1-alpha
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: docker version
run: docker version
- name: docker info
run: docker info
- name: java version
run: java -version
# - name: Debug
# run: ./gradlew checkDockerClient --info --stacktrace
- name: clean build
2 changes: 1 addition & 1 deletion .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
@@ -15,4 +15,4 @@ jobs:
uses: gradle-update/update-gradle-wrapper-action@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: gradle/wrapper-validation-action@v2
- uses: gradle/wrapper-validation-action@v3
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@ plugins {

val dependencyVersions = listOf(
"com.squareup.okio:okio-jvm:3.9.0",
"net.bytebuddy:byte-buddy:1.14.12",
"net.bytebuddy:byte-buddy-agent:1.14.12",
"net.bytebuddy:byte-buddy:1.14.14",
"net.bytebuddy:byte-buddy-agent:1.14.14",
"org.apache.commons:commons-compress:1.26.1",
"org.codehaus.groovy:groovy:3.0.21",
"org.codehaus.groovy:groovy-json:3.0.21",
2 changes: 1 addition & 1 deletion client-groovy4/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -124,7 +124,7 @@ dependencies {

testImplementation("org.junit.platform:junit-platform-launcher:1.10.2")
testImplementation("org.spockframework:spock-core:2.3-groovy-4.0")
testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.12")
testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.14")
testRuntimeOnly("org.objenesis:objenesis:3.3")
testImplementation("io.github.joke:spock-mockable:2.3.0")

2 changes: 1 addition & 1 deletion client/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -124,7 +124,7 @@ dependencies {

testImplementation("org.junit.platform:junit-platform-launcher:1.10.2")
testImplementation("org.spockframework:spock-core:2.3-groovy-3.0")
testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.12")
testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.14")
testRuntimeOnly("org.objenesis:objenesis:3.3")
testImplementation("io.github.joke:spock-mockable:2.3.0")

2 changes: 1 addition & 1 deletion explore/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ dependencies {

// testImplementation("org.spockframework:spock-core:2.3-groovy-3.0")
testImplementation("org.spockframework:spock-core:2.3-groovy-4.0")
testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.12")
testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.14")
testRuntimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.14")
}

4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
2 changes: 1 addition & 1 deletion integration-test/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ dependencies {
testImplementation("de.gesellix:testutil:[2024-01-01T01-01-01,)")
testImplementation("org.spockframework:spock-core:2.3-groovy-3.0")
// testImplementation("org.spockframework:spock-core:2.3-groovy-4.0")
testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.12")
testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.14")
testImplementation("org.apache.commons:commons-lang3:3.14.0")
testRuntimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.14")
}