Skip to content

Commit 6a8370a

Browse files
committed
stop trying to force resolution everywhere
1 parent 0c7fc7e commit 6a8370a

File tree

2 files changed

+14
-28
lines changed

2 files changed

+14
-28
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# fnord
2-
31
# workflow
42

53
[![Kotlin CI](https://github.com/square/workflow-kotlin/workflows/Kotlin%20CI/badge.svg)](https://github.com/square/workflow-kotlin/actions?query=branch%3Amain)
@@ -9,6 +7,8 @@
97

108
Workflow is an application framework that provides architectural primitives.
119

10+
## fnord
11+
1212
Workflow is:
1313

1414
* Written in and used for Kotlin and Swift

build.gradle.kts

+12-26
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ plugins {
3030
}
3131

3232
shardConnectedCheckTasks(project)
33-
34-
subprojects {
35-
// Wait for version catalog to be ready. There is no direct hook, but it happens
36-
// before base is applied.
37-
plugins.withId("base") {
38-
configurations.configureEach {
39-
// There could be transitive dependencies in tests with a lower version. This could cause
40-
// problems with a newer Kotlin version that we use.
41-
resolutionStrategy.force(libs.kotlin.reflect)
42-
}
43-
}
44-
}
33+
//
34+
// subprojects {
35+
// // Wait for version catalog to be ready. There is no direct hook, but it happens
36+
// // before base is applied.
37+
// plugins.withId("base") {
38+
// configurations.configureEach {
39+
// // There could be transitive dependencies in tests with a lower version. This could cause
40+
// // problems with a newer Kotlin version that we use.
41+
// resolutionStrategy.force(libs.kotlin.reflect)
42+
// }
43+
// }
44+
// }
4545

4646
apply(from = rootProject.file(".buildscript/binary-validation.gradle"))
4747

@@ -112,20 +112,6 @@ subprojects {
112112
.configureEach { mustRunAfter(tasks.matching { it is Sign }) }
113113
}
114114

115-
allprojects {
116-
117-
configurations.all {
118-
resolutionStrategy.eachDependency {
119-
// This ensures that any time a dependency has a transitive dependency upon androidx.lifecycle,
120-
// it uses the same version as the rest of the project. This is crucial, since Androidx
121-
// libraries are never in sync and lifecycle 2.4.0 introduced api-breaking changes.
122-
if (requested.group == "androidx.lifecycle") {
123-
useVersion(libs.versions.androidx.lifecycle.get())
124-
}
125-
}
126-
}
127-
}
128-
129115
// This task is invoked by the documentation site generator script in the main workflow project (not
130116
// in this repo), which also expects the generated files to be in a specific location. Both the task
131117
// name and destination directory are defined in this script:

0 commit comments

Comments
 (0)