Skip to content

Commit af6bf52

Browse files
johnynekOscar Boykin
andauthored
Fix a bug in refactoring GradleResolver (#324)
Co-authored-by: Oscar Boykin <oboykin@netflix.com>
1 parent 5944ed6 commit af6bf52

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/scala/com/github/johnynek/bazel_deps/MakeDeps.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,13 @@ object MakeDeps {
110110
lazy val coursierResolver =
111111
new CoursierResolver(model.getOptions.getResolvers, ec, 3600.seconds, resolverCachePath)
112112

113-
resolve(
114-
model,
115-
new GradleResolver(
113+
val resolver = new GradleResolver(
116114
model.getOptions.getVersionConflictPolicy,
117115
g,
118-
{ ls => coursierResolver.run(coursierResolver.getShas(ls)) }))
116+
{ ls => coursierResolver.run(coursierResolver.getShas(ls)) })
117+
// Note: this branch fully defers to GradleResolver and not
118+
// the private resolve(model, resolver) method here
119+
resolver.resolve(model)
119120
}
120121

121122
private type Res = (

0 commit comments

Comments
 (0)