Skip to content

Commit 6c46b3c

Browse files
committedAug 21, 2020
[Jetnews, Rally] Removes resolutionStrategy
Change-Id: I90a44c1b60f5f3418db78026ac22d0789e6297e3
1 parent 2821af2 commit 6c46b3c

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed
 

Diff for: ‎JetNews/app/build.gradle

+1-11
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ android {
5151
}
5252

5353
composeOptions {
54+
kotlinCompilerVersion kotlin_version
5455
kotlinCompilerExtensionVersion compose_version
5556
}
5657
}
@@ -91,14 +92,3 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
9192
jvmTarget = "1.8"
9293
}
9394
}
94-
95-
// TODO: Figure out which dependencies need this and force them individually
96-
configurations.configureEach() {
97-
resolutionStrategy {
98-
eachDependency { DependencyResolveDetails details ->
99-
if (details.requested.group == 'org.jetbrains.kotlin') {
100-
details.useVersion kotlin_version
101-
}
102-
}
103-
}
104-
}

Diff for: ‎Rally/app/build.gradle

+1-10
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ android {
5656
}
5757

5858
composeOptions {
59+
kotlinCompilerVersion Libs.Kotlin.version
5960
kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
6061
}
6162

@@ -85,13 +86,3 @@ dependencies {
8586
androidTestImplementation Libs.AndroidX.Test.Ext.junit
8687
androidTestImplementation Libs.AndroidX.Compose.uiTest
8788
}
88-
89-
configurations.configureEach() {
90-
resolutionStrategy {
91-
eachDependency { DependencyResolveDetails details ->
92-
if (details.requested.group == 'org.jetbrains.kotlin') {
93-
details.useVersion Libs.Kotlin.version
94-
}
95-
}
96-
}
97-
}

0 commit comments

Comments
 (0)
Please sign in to comment.