From 6c46b3c2302d54c5297f9b7cb6a15d75290d01b0 Mon Sep 17 00:00:00 2001
From: Jose Alcerreca <jalc@google.com>
Date: Fri, 21 Aug 2020 11:27:44 +0200
Subject: [PATCH] [Jetnews, Rally] Removes resolutionStrategy

Change-Id: I90a44c1b60f5f3418db78026ac22d0789e6297e3
---
 JetNews/app/build.gradle | 12 +-----------
 Rally/app/build.gradle   | 11 +----------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle
index 52c7b780ca..4a1fda9065 100644
--- a/JetNews/app/build.gradle
+++ b/JetNews/app/build.gradle
@@ -51,6 +51,7 @@ android {
     }
 
     composeOptions {
+        kotlinCompilerVersion kotlin_version
         kotlinCompilerExtensionVersion compose_version
     }
 }
@@ -91,14 +92,3 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         jvmTarget = "1.8"
     }
 }
-
-// TODO: Figure out which dependencies need this and force them individually
-configurations.configureEach() {
-    resolutionStrategy {
-        eachDependency { DependencyResolveDetails details ->
-            if (details.requested.group == 'org.jetbrains.kotlin') {
-                details.useVersion kotlin_version
-            }
-        }
-    }
-}
diff --git a/Rally/app/build.gradle b/Rally/app/build.gradle
index 555edd6c67..0518105b23 100644
--- a/Rally/app/build.gradle
+++ b/Rally/app/build.gradle
@@ -56,6 +56,7 @@ android {
     }
 
     composeOptions {
+        kotlinCompilerVersion Libs.Kotlin.version
         kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
     }
 
@@ -85,13 +86,3 @@ dependencies {
     androidTestImplementation Libs.AndroidX.Test.Ext.junit
     androidTestImplementation Libs.AndroidX.Compose.uiTest
 }
-
-configurations.configureEach() {
-    resolutionStrategy {
-        eachDependency { DependencyResolveDetails details ->
-            if (details.requested.group == 'org.jetbrains.kotlin') {
-                details.useVersion Libs.Kotlin.version
-            }
-        }
-    }
-}