Require okio >= 3.x

gesellix · gesellix · commit dd48be5ae055 · 2022-05-03T22:16:01.000+02:00
Explicitly using okio-jvm makes the artifacts Maven-compatible. Relates to gesellix/docker-client#245
diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts
@@ -39,10 +39,15 @@ dependencies {
         }
       }
     }
-    implementation("com.squareup.okio:okio") {
-      version {
-        strictly("[2.5,4)")
-        prefer("3.1.0")
+    listOf(
+      "com.squareup.okio:okio",
+      "com.squareup.okio:okio-jvm"
+    ).forEach {
+      implementation(it) {
+        version {
+          strictly("[3,4)")
+          prefer("3.1.0")
+        }
       }
     }
     listOf(
@@ -67,7 +72,7 @@ dependencies {
   implementation("org.slf4j:slf4j-api:1.7.36")
   testImplementation("ch.qos.logback:logback-classic:[1.2,2)!!1.2.11")
 
-  implementation("com.squareup.okio:okio:3.1.0")
+  implementation("com.squareup.okio:okio-jvm:3.1.0")
   implementation("com.squareup.okhttp3:okhttp:4.9.3")
   testImplementation("com.squareup.okhttp3:mockwebserver:4.9.3")
 
diff --git a/integrationtest/build.gradle.kts b/integrationtest/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
     }
     implementation("com.squareup.okio:okio") {
       version {
-        strictly("[2.5,4)")
+        strictly("[3,4)")
         prefer("3.1.0")
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,15 @@ dependencies {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
`42`		`- implementation("com.squareup.okio:okio") {`
`43`		`- version {`
`44`		`- strictly("[2.5,4)")`
`45`		`- prefer("3.1.0")`
	`42`	`+ listOf(`
	`43`	`+ "com.squareup.okio:okio",`
	`44`	`+ "com.squareup.okio:okio-jvm"`
	`45`	`+ ).forEach {`
	`46`	`+ implementation(it) {`
	`47`	`+ version {`
	`48`	`+ strictly("[3,4)")`
	`49`	`+ prefer("3.1.0")`
	`50`	`+ }`
`46`	`51`	`}`
`47`	`52`	`}`
`48`	`53`	`listOf(`
`@@ -67,7 +72,7 @@ dependencies {`
`67`	`72`	`implementation("org.slf4j:slf4j-api:1.7.36")`
`68`	`73`	`testImplementation("ch.qos.logback:logback-classic:[1.2,2)!!1.2.11")`
`69`	`74`
`70`		`- implementation("com.squareup.okio:okio:3.1.0")`
	`75`	`+ implementation("com.squareup.okio:okio-jvm:3.1.0")`
`71`	`76`	`implementation("com.squareup.okhttp3:okhttp:4.9.3")`
`72`	`77`	`testImplementation("com.squareup.okhttp3:mockwebserver:4.9.3")`
`73`	`78`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ dependencies {`
`34`	`34`	`}`
`35`	`35`	`implementation("com.squareup.okio:okio") {`
`36`	`36`	`version {`
`37`		`- strictly("[2.5,4)")`
	`37`	`+ strictly("[3,4)")`
`38`	`38`	`prefer("3.1.0")`
`39`	`39`	`}`
`40`	`40`	`}`