|
1 | 1 | package mill.androidlib
|
2 | 2 |
|
| 3 | +import coursier.core.{Module, ModuleName, Organization} |
3 | 4 | import coursier.core.VariantSelector.VariantMatcher
|
4 | 5 | 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} |
6 | 9 | import mill.T
|
7 | 10 | import mill.define.{ModuleRef, PathRef, Target, Task}
|
8 | 11 | import mill.scalalib.*
|
@@ -142,7 +145,11 @@ trait AndroidModule extends JavaModule {
|
142 | 145 | VariantMatcher.Equals("androidJvm"),
|
143 | 146 | VariantMatcher.Equals("jvm")
|
144 | 147 | ))
|
145 |
| - ) |
| 148 | + ).withRules(Seq( |
| 149 | + coursier.params.rule.SameVersion( |
| 150 | + Set(ModuleMatcher(Module(Organization("androix.*"), ModuleName("*"), Map.empty))) |
| 151 | + ) -> RuleResolution.TryResolve |
| 152 | + )) |
146 | 153 | }
|
147 | 154 |
|
148 | 155 | /**
|
@@ -230,10 +237,6 @@ trait AndroidModule extends JavaModule {
|
230 | 237 | extractAarFiles(aarFiles, transformDest)
|
231 | 238 | }
|
232 | 239 |
|
233 |
| - override def mapDependencies: Task[Dependency => Dependency] = Task.Anon { |
234 |
| - super.mapDependencies().andThen(dep => dep.withEndorseStrictVersions(true)) |
235 |
| - } |
236 |
| - |
237 | 240 | /**
|
238 | 241 | * Classpath for the manifest merger run.
|
239 | 242 | */
|
|
0 commit comments