File tree Expand file tree Collapse file tree 1 file changed +3
-8
lines changed
compiler/src/dotty/tools/dotc/sbt Expand file tree Collapse file tree 1 file changed +3
-8
lines changed Original file line number Diff line number Diff line change @@ -141,7 +141,8 @@ class ExtractDependencies extends Phase {
141
141
def processExternalDependency (depFile : AbstractFile ) = {
142
142
143
143
val binaryClassName = ctx.atPhase(ctx.flattenPhase) { implicit ctx =>
144
- dep.to.fullName.toString
144
+ if (dep.to.is(JavaDefined )) dep.to.fullName.stripModuleClassSuffix.toString
145
+ else dep.to.fullName.toString
145
146
}
146
147
147
148
depFile match {
@@ -151,13 +152,7 @@ class ExtractDependencies extends Phase {
151
152
}
152
153
153
154
case pf : PlainFile => // The dependency comes from a class file
154
- val classFile =
155
- if (dep.to.is(ModuleClass , butNot = Scala2x ))
156
- new File (pf.path.stripSuffix(" .class" ) + " $.class" )
157
- // Module Class loaded from TASTY are loaded from their companion class file.
158
- // We recover the name of the module class file.
159
- else pf.file
160
- binaryDependency(classFile, binaryClassName)
155
+ binaryDependency(pf.file, binaryClassName)
161
156
162
157
case _ =>
163
158
ctx.warning(s " sbt-deps: Ignoring dependency $depFile of class ${depFile.getClass}} " )
You can’t perform that action at this time.
0 commit comments