From 0a58aab82bb8c1a010cefee4966cc33163e448b6 Mon Sep 17 00:00:00 2001 From: alexsarrell Date: Wed, 2 Oct 2024 10:13:40 +0300 Subject: [PATCH 1/3] routine-VS-5909: Bump retrofit and okhttp version --- build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Version.kt | 1 + channels/telegram/build.gradle.kts | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 06352597..7161d5b9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { allprojects { group = "com.just-ai.jaicf" - version = "1.3.6" + version = "1.3.7-SNAPSHOT" repositories { mavenCentral() diff --git a/buildSrc/src/main/kotlin/Version.kt b/buildSrc/src/main/kotlin/Version.kt index b3e96a69..a2b619f6 100644 --- a/buildSrc/src/main/kotlin/Version.kt +++ b/buildSrc/src/main/kotlin/Version.kt @@ -10,6 +10,7 @@ object Version { const val jUnit = "5.6.0" const val jetty = "9.4.3.v20170317" + const val okhttp3 = "4.9.3" const val ktor = "1.5.1" const val serializationRuntime = "1.0.1" const val coroutinesCore = "1.4.2" diff --git a/channels/telegram/build.gradle.kts b/channels/telegram/build.gradle.kts index e1ef040d..bd777129 100644 --- a/channels/telegram/build.gradle.kts +++ b/channels/telegram/build.gradle.kts @@ -16,7 +16,12 @@ dependencies { exclude("org.jetbrains.kotlin", "kotlin-stdlib") exclude("com.squareup.okhttp3", "okhttp") exclude("com.squareup.okhttp3", "logging-interceptor") + exclude("com.squareup.retrofit2", "retrofit") } - api("com.squareup.okhttp3:okhttp:3.14.0") - api("com.squareup.okhttp3:logging-interceptor:3.14.0") + api("com.squareup.retrofit2:retrofit:2.5.0") { + exclude("com.squareup.okhttp3", "okhttp") + exclude("com.squareup.okhttp3", "logging-interceptor") + } + api("com.squareup.okhttp3:okhttp", Version.okhttp3) + api("com.squareup.okhttp3:logging-interceptor", Version.okhttp3) } From c04dae5d9075d1f0e88917a7e6b38ab8a672c853 Mon Sep 17 00:00:00 2001 From: alexsarrell Date: Fri, 4 Oct 2024 13:48:06 +0300 Subject: [PATCH 2/3] routine-VS-5909: remove snapshot from version label --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7161d5b9..a4aa9b17 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { allprojects { group = "com.just-ai.jaicf" - version = "1.3.7-SNAPSHOT" + version = "1.3.7" repositories { mavenCentral() From d556cfa812167aac84f37fc74d7c2aa807108eb9 Mon Sep 17 00:00:00 2001 From: alexsarrell Date: Fri, 4 Oct 2024 13:58:26 +0300 Subject: [PATCH 3/3] routine-VS-5909: inject okhttp3 version to dependency string --- channels/telegram/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/telegram/build.gradle.kts b/channels/telegram/build.gradle.kts index bd777129..47fff45e 100644 --- a/channels/telegram/build.gradle.kts +++ b/channels/telegram/build.gradle.kts @@ -22,6 +22,6 @@ dependencies { exclude("com.squareup.okhttp3", "okhttp") exclude("com.squareup.okhttp3", "logging-interceptor") } - api("com.squareup.okhttp3:okhttp", Version.okhttp3) - api("com.squareup.okhttp3:logging-interceptor", Version.okhttp3) + api("com.squareup.okhttp3:okhttp:${Version.okhttp3}") + api("com.squareup.okhttp3:logging-interceptor:${Version.okhttp3}") }