From b8f265fa364da8ad551a5d6eb0e942aec9ab1cb8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 03:22:05 +0000 Subject: [PATCH] Update okhttp to v4.12.0 --- deps_fdroid.txt | 27 +++++++++++++-------------- deps_googleplay.txt | 27 +++++++++++++-------------- gradle/libs.versions.toml | 2 +- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/deps_fdroid.txt b/deps_fdroid.txt index f7e2e0a25..e804f56af 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -189,13 +189,12 @@ ++--- com.github.bitfireAT:dav4jvm:2.2.1 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 -> 1.9.10 (*) +| +--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0 -+| \--- com.squareup.okhttp3:okhttp:4.10.0 -> 4.11.0 -+| +--- com.squareup.okio:okio:3.2.0 -> 3.3.0 -+| | \--- com.squareup.okio:okio-jvm:3.3.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.10 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0 -> 1.9.10 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.9.10 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*) ++| \--- com.squareup.okhttp3:okhttp:4.10.0 -> 4.12.0 ++| +--- com.squareup.okio:okio:3.6.0 ++| | \--- com.squareup.okio:okio-jvm:3.6.0 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10 ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*) ++--- com.github.tasks:ical4android:12fe73a +| +--- org.mnode.ical4j:ical4j:3.2.7 +| | +--- javax.cache:cache-api:1.1.1 @@ -579,9 +578,9 @@ ++--- io.noties.markwon:ext-tasklist:4.6.2 +| \--- io.noties.markwon:core:4.6.2 (*) ++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (*) -++--- com.squareup.okhttp3:okhttp:4.11.0 (*) +++--- com.squareup.okhttp3:okhttp:4.12.0 (*) ++--- com.github.franmontiel:PersistentCookieJar:1.0.1 -+| \--- com.squareup.okhttp3:okhttp:3.1.2 -> 4.11.0 (*) ++| \--- com.squareup.okhttp3:okhttp:3.1.2 -> 4.12.0 (*) ++--- com.google.code.gson:gson:2.10.1 ++--- com.google.android.material:material:1.10.0 (*) ++--- androidx.compose.material3:material3 -> 1.1.2 @@ -864,7 +863,7 @@ ++--- com.etebase:client:2.3.2 +| +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*) +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 -+| \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.11.0 (*) ++| \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.12.0 (*) ++--- com.github.QuadFlask:colorpicker:0.0.15 +| \--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*) ++--- net.openid:appauth:0.11.1 @@ -879,11 +878,11 @@ +| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++--- org.osmdroid:osmdroid-android:6.1.17 ++--- com.squareup.retrofit2:retrofit:2.9.0 -+| \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.11.0 (*) ++| \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.12.0 (*) ++--- com.squareup.retrofit2:converter-moshi:2.9.0 +| +--- com.squareup.retrofit2:retrofit:2.9.0 (*) +| \--- com.squareup.moshi:moshi:1.8.0 -+| \--- com.squareup.okio:okio:1.16.0 -> 3.3.0 (*) ++| \--- com.squareup.okio:okio:1.16.0 -> 3.6.0 (*) ++--- androidx.recyclerview:recyclerview:1.3.1 (*) ++--- androidx.compose:compose-bom:2023.10.00 +| +--- androidx.compose.foundation:foundation:1.5.3 (c) @@ -1036,8 +1035,8 @@ +| | | +--- androidx.lifecycle:lifecycle-runtime:2.6.1 -> 2.6.2 (*) +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.9.10 (*) -+| | | +--- com.squareup.okhttp3:okhttp:4.11.0 (*) -+| | | \--- com.squareup.okio:okio:3.3.0 (*) ++| | | +--- com.squareup.okhttp3:okhttp:4.11.0 -> 4.12.0 (*) ++| | | \--- com.squareup.okio:okio:3.3.0 -> 3.6.0 (*) +| | +--- androidx.compose.foundation:foundation:1.4.3 -> 1.5.3 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*) +| +--- io.coil-kt:coil:2.4.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 5f5dcd044..81db419f0 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -509,13 +509,12 @@ ++--- com.github.bitfireAT:dav4jvm:2.2.1 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 -> 1.9.10 (*) +| +--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0 -+| \--- com.squareup.okhttp3:okhttp:4.10.0 -> 4.11.0 -+| +--- com.squareup.okio:okio:3.2.0 -> 3.3.0 -+| | \--- com.squareup.okio:okio-jvm:3.3.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 -> 1.9.10 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0 -> 1.9.10 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.20 -> 1.9.10 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*) ++| \--- com.squareup.okhttp3:okhttp:4.10.0 -> 4.12.0 ++| +--- com.squareup.okio:okio:3.6.0 ++| | \--- com.squareup.okio:okio-jvm:3.6.0 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10 ++| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*) ++--- com.github.tasks:ical4android:12fe73a +| +--- org.mnode.ical4j:ical4j:3.2.7 +| | +--- javax.cache:cache-api:1.1.1 @@ -768,9 +767,9 @@ ++--- io.noties.markwon:ext-tasklist:4.6.2 +| \--- io.noties.markwon:core:4.6.2 (*) ++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (*) -++--- com.squareup.okhttp3:okhttp:4.11.0 (*) +++--- com.squareup.okhttp3:okhttp:4.12.0 (*) ++--- com.github.franmontiel:PersistentCookieJar:1.0.1 -+| \--- com.squareup.okhttp3:okhttp:3.1.2 -> 4.11.0 (*) ++| \--- com.squareup.okhttp3:okhttp:3.1.2 -> 4.12.0 (*) ++--- com.google.code.gson:gson:2.10.1 ++--- com.google.android.material:material:1.10.0 (*) ++--- androidx.compose.material3:material3 -> 1.1.2 @@ -1053,7 +1052,7 @@ ++--- com.etebase:client:2.3.2 +| +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*) +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 -+| \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.11.0 (*) ++| \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.12.0 (*) ++--- com.github.QuadFlask:colorpicker:0.0.15 +| \--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*) ++--- net.openid:appauth:0.11.1 @@ -1068,11 +1067,11 @@ +| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++--- org.osmdroid:osmdroid-android:6.1.17 ++--- com.squareup.retrofit2:retrofit:2.9.0 -+| \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.11.0 (*) ++| \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.12.0 (*) ++--- com.squareup.retrofit2:converter-moshi:2.9.0 +| +--- com.squareup.retrofit2:retrofit:2.9.0 (*) +| \--- com.squareup.moshi:moshi:1.8.0 -+| \--- com.squareup.okio:okio:1.16.0 -> 3.3.0 (*) ++| \--- com.squareup.okio:okio:1.16.0 -> 3.6.0 (*) ++--- androidx.recyclerview:recyclerview:1.3.1 (*) ++--- androidx.compose:compose-bom:2023.10.00 +| +--- androidx.compose.foundation:foundation:1.5.3 (c) @@ -1225,8 +1224,8 @@ +| | | +--- androidx.lifecycle:lifecycle-runtime:2.6.1 -> 2.6.2 (*) +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 (*) +| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.9.10 (*) -+| | | +--- com.squareup.okhttp3:okhttp:4.11.0 (*) -+| | | \--- com.squareup.okio:okio:3.3.0 (*) ++| | | +--- com.squareup.okhttp3:okhttp:4.11.0 -> 4.12.0 (*) ++| | | \--- com.squareup.okio:okio:3.3.0 -> 3.6.0 (*) +| | +--- androidx.compose.foundation:foundation:1.4.3 -> 1.5.3 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*) +| +--- io.coil-kt:coil:2.4.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a14853083..305693012 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,7 +41,7 @@ make-it-easy = "4.0.1" markwon = "4.6.2" material = "1.10.0" mockito = "5.6.0" -okhttp = "4.11.0" +okhttp = "4.12.0" opentasks = "562fec5" osmdroid = "6.1.17" oss-licenses-plugin = "0.10.6"