From d5e86d380b22728e0e5c5254e9ad948ef2730a3a Mon Sep 17 00:00:00 2001
From: Alex Tymchenko <alex.tymchenko@teamdev.com>
Date: Fri, 24 Nov 2023 17:07:31 +0000
Subject: [PATCH] Force another Kotlin dependency, as it comes out conflicting
 through some transitive dependencies.

---
 buildSrc/src/main/kotlin/DependencyResolution.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/DependencyResolution.kt b/buildSrc/src/main/kotlin/DependencyResolution.kt
index 4d02db23..aa2eb715 100644
--- a/buildSrc/src/main/kotlin/DependencyResolution.kt
+++ b/buildSrc/src/main/kotlin/DependencyResolution.kt
@@ -80,7 +80,7 @@ fun NamedDomainObjectContainer<Configuration>.forceVersions() {
 }
 
 private fun ResolutionStrategy.forceProductionDependencies() {
-    @Suppress("DEPRECATION") // Force SLF4J version.
+    @Suppress("DEPRECATION") // Force versions of SLF4J and Kotlin libs.
     force(
         AnimalSniffer.lib,
         AutoCommon.lib,
@@ -95,6 +95,7 @@ private fun ResolutionStrategy.forceProductionDependencies() {
         Kotlin.reflect,
         Kotlin.stdLib,
         Kotlin.stdLibCommon,
+        Kotlin.stdLibJdk7,
         Kotlin.stdLibJdk8,
         Protobuf.GradlePlugin.lib,
         Protobuf.libs,