From 4190ca8a62196f0c2b57868066c72a6d3ba7b512 Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sun, 15 Oct 2023 16:35:02 +0100 Subject: [PATCH] [4.x] Bump okio to 3.6 (#8052) --- android-test/build.gradle | 1 - build.gradle | 4 +--- okhttp/build.gradle | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/android-test/build.gradle b/android-test/build.gradle index 283dd5b2bd2f..b619a4f21818 100644 --- a/android-test/build.gradle +++ b/android-test/build.gradle @@ -32,7 +32,6 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" implementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}" implementation 'com.google.android.gms:play-services-safetynet:18.0.1' implementation project(':okhttp') diff --git a/build.gradle b/build.gradle index d19aa0ca0bc0..6478b17bc097 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { 'junit': '4.13.2', 'kotlin': '1.8.21', 'moshi': '1.15.0', - 'okio': '3.4.0', + 'okio': '3.6.0', 'ktlint': '0.38.0', 'picocli': '4.2.0', 'openjsse': '1.1.12' @@ -39,8 +39,6 @@ buildscript { 'jsoup': "org.jsoup:jsoup:${versions.jsoup}", 'jsr305': "com.google.code.findbugs:jsr305:${versions.findbugs}", 'junit': "junit:junit:${versions.junit}", - 'kotlinStdlib': "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}", - 'kotlinStdlibJdk8': "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}", 'moshi': "com.squareup.moshi:moshi:${versions.moshi}", 'moshiKotlin': "com.squareup.moshi:moshi-kotlin-codegen:${versions.moshi}", 'okio': "com.squareup.okio:okio:${versions.okio}", diff --git a/okhttp/build.gradle b/okhttp/build.gradle index 3080e2d89d7e..f8b923585aec 100644 --- a/okhttp/build.gradle +++ b/okhttp/build.gradle @@ -23,10 +23,6 @@ task copyJavaTemplates(type: Copy) { dependencies { api deps.okio - api deps.kotlinStdlib - // Only imported to avoid broken vulnerability scanners for CVE-2022-24329 - // https://github.com/square/okhttp/issues/7654 - api deps.kotlinStdlibJdk8 compileOnly deps.android compileOnly deps.bouncycastle compileOnly deps.bouncycastletls