Skip to content

Commit d95944a

Browse files
committed
Remove map dependencies
1 parent 4e1d177 commit d95944a

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

libs/androidlib/src/mill/androidlib/AndroidModule.scala

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package mill.androidlib
22

3+
import coursier.core.{Module, ModuleName, Organization}
34
import coursier.core.VariantSelector.VariantMatcher
45
import coursier.params.ResolutionParams
5-
import coursier.{Dependency, Repository}
6+
import coursier.params.rule.RuleResolution
7+
import coursier.util.ModuleMatcher
8+
import coursier.{Dependency, ModuleName, Repository, VersionConstraint}
69
import mill.T
710
import mill.define.{ModuleRef, PathRef, Target, Task}
811
import mill.scalalib.*
@@ -142,7 +145,11 @@ trait AndroidModule extends JavaModule {
142145
VariantMatcher.Equals("androidJvm"),
143146
VariantMatcher.Equals("jvm")
144147
))
145-
)
148+
).withRules(Seq(
149+
coursier.params.rule.SameVersion(
150+
Set(ModuleMatcher(Module(Organization("androix.*"), ModuleName("*"), Map.empty)))
151+
) -> RuleResolution.TryResolve
152+
))
146153
}
147154

148155
/**
@@ -230,10 +237,6 @@ trait AndroidModule extends JavaModule {
230237
extractAarFiles(aarFiles, transformDest)
231238
}
232239

233-
override def mapDependencies: Task[Dependency => Dependency] = Task.Anon {
234-
super.mapDependencies().andThen(dep => dep.withEndorseStrictVersions(true))
235-
}
236-
237240
/**
238241
* Classpath for the manifest merger run.
239242
*/

0 commit comments

Comments
 (0)