From b2bd1f745f3f7be9e4391b8feaab63563a91650a Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Wed, 15 Feb 2017 14:42:24 +0100 Subject: [PATCH] Update scalaCompilerBridgeSource --- main-actions/src/main/scala/sbt/Compiler.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main-actions/src/main/scala/sbt/Compiler.scala b/main-actions/src/main/scala/sbt/Compiler.scala index 899dfa55d..5a5f70493 100644 --- a/main-actions/src/main/scala/sbt/Compiler.scala +++ b/main-actions/src/main/scala/sbt/Compiler.scala @@ -19,13 +19,13 @@ object Compiler { private[sbt] def defaultCompilerBridgeSource(sv: String): ModuleID = VersionNumber(sv) match { case VersionNumber(ns, _, _) if (ns.size == 3) && (ns(0) == 2) && (ns(1) <= 10) => scalaCompilerBridgeSource2_10 - case _ => scalaCompilerBridgeSource2_11 + case _ => scalaCompilerBridgeSource2_12 } private[sbt] def scalaCompilerBridgeSource2_10: ModuleID = ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-bridge_2.10", ComponentCompiler.incrementalVersion).withConfigurations(Some("component")).sources() - private[sbt] def scalaCompilerBridgeSource2_11: ModuleID = - ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-bridge_2.11", + private[sbt] def scalaCompilerBridgeSource2_12: ModuleID = + ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-bridge_2.12", ComponentCompiler.incrementalVersion).withConfigurations(Some("component")).sources() /** Inputs necessary to run the incremental compiler. */ @@ -108,7 +108,7 @@ object Compiler { { val scalaProvider = app.provider.scalaProvider val instance = ScalaInstance(scalaProvider.version, scalaProvider.launcher) - val sourceModule = scalaCompilerBridgeSource2_11 + val sourceModule = scalaCompilerBridgeSource2_12 compilers(instance, cpOptions, None, ivyConfiguration, fileToStore, sourceModule) }