From c74eae096f1b7d86e55acef431b915f59802e6b1 Mon Sep 17 00:00:00 2001 From: Martin Duhem Date: Fri, 11 Sep 2015 10:21:45 +0200 Subject: [PATCH] Rename binary form of compiler bridge This will avoid all clashes between modules that may have the same name as other components of sbt, or two different compiler bridges that would happen to have the same name. --- .../src/main/scala/sbt/compiler/ComponentCompiler.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/compile-ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala b/internal/compile-ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala index e8e63b002..4f7e9fabe 100644 --- a/internal/compile-ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala +++ b/internal/compile-ivy/src/main/scala/sbt/compiler/ComponentCompiler.scala @@ -107,7 +107,8 @@ private[compiler] class IvyComponentCompiler(compiler: RawCompiler, manager: Com private val buffered = new BufferedLogger(FullLogger(log)) def apply(): File = { - val binID = binaryID(sourcesModule.name) + // binID is of the form "org.example-compilerbridge-1.0.0-bin_2.11.7__50.0" + val binID = binaryID(s"${sourcesModule.organization}-${sourcesModule.name}-${sourcesModule.revision}") manager.file(binID)(new IfMissing.Define(true, compileAndInstall(binID))) }