[4.x] Update Okio to 3.2.0 (#7591)

yschimke · swankjesse · web-flow · commit 81d34114e29d · 2022-12-30T09:38:41.000-05:00
* Update Okio to 3.2.0

This version does the right thing for Kotlin Multiplatform
and Maven.

* Filtering okio-jvm to okio.

Co-authored-by: Jesse Wilson &lt;jwilson@squareup.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
       'junit': '4.13',
       'kotlin': '1.6.20',
       'moshi': '1.13.0',
-      'okio': '3.0.0',
+      'okio': '3.2.0',
       'ktlint': '0.38.0',
       'picocli': '4.2.0',
       'openjsse': '1.1.0'
@@ -273,6 +273,15 @@ subprojects { project ->
             developerConnection = 'scm:git:ssh://git@github.com/square/okhttp.git'
             url = 'https://github.com/square/okhttp'
           }
+          withXml {
+            asNode().dependencies.dependency
+              .findAll { dependency ->
+                dependency.artifactId.text() == 'okio-jvm'
+              }
+              .each { dependency ->
+                dependency.artifactId*.value = 'okio'
+              }
+          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ buildscript {`
`17`	`17`	`'junit': '4.13',`
`18`	`18`	`'kotlin': '1.6.20',`
`19`	`19`	`'moshi': '1.13.0',`
`20`		`- 'okio': '3.0.0',`
	`20`	`+ 'okio': '3.2.0',`
`21`	`21`	`'ktlint': '0.38.0',`
`22`	`22`	`'picocli': '4.2.0',`
`23`	`23`	`'openjsse': '1.1.0'`
`@@ -273,6 +273,15 @@ subprojects { project ->`
`273`	`273`	`developerConnection = 'scm:git:ssh://git@github.com/square/okhttp.git'`
`274`	`274`	`url = 'https://github.com/square/okhttp'`
`275`	`275`	`}`
	`276`	`+ withXml {`
	`277`	`+ asNode().dependencies.dependency`
	`278`	`+ .findAll { dependency ->`
	`279`	`+ dependency.artifactId.text() == 'okio-jvm'`
	`280`	`+ }`
	`281`	`+ .each { dependency ->`
	`282`	`+ dependency.artifactId*.value = 'okio'`
	`283`	`+ }`
	`284`	`+ }`
`276`	`285`	`}`
`277`	`286`	`}`
`278`	`287`	`}`