luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename `getXXX` by `fetchXXX` 

As suggested by Eugene.
This commit is contained in:
jvican 2017-05-26 15:32:29 +02:00
parent 551c5d9aa4
commit 11fa775ef8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala
View File

@ -78,8 +78,8 @@ private[sbt] object ZincComponentCompiler {
zinc.getCompiledBridgeJar
}
override def getCompiledBridge(scalaInstance: xsbti.compile.ScalaInstance,
logger: xsbti.Logger): File = {
override def fetchCompiledBridge(scalaInstance: xsbti.compile.ScalaInstance,
logger: xsbti.Logger): File = {
val scalaVersion = scalaInstance.actualVersion()
val bridgeSources = getDefaultBridgeModule(scalaVersion)
getCompiledBridge(bridgeSources, scalaInstance, logger)
@ -118,8 +118,8 @@ private[sbt] object ZincComponentCompiler {
}
}
override def getScalaInstance(scalaVersion: String,
logger: xsbti.Logger): xsbti.compile.ScalaInstance = {
override def fetchScalaInstance(scalaVersion: String,
logger: xsbti.Logger): xsbti.compile.ScalaInstance = {
import sbt.io.Path.toURLs
val scalaArtifacts = getScalaArtifacts(scalaVersion, logger)
val scalaCompiler = scalaArtifacts.compiler

6
internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala
View File

@ -45,8 +45,8 @@ abstract class BridgeProviderSpecification extends UnitSpec {
def getCompilerBridge(targetDir: File, log: Logger, scalaVersion: String): File = {
val provider = getZincProvider(targetDir, log)
val scalaInstance = provider.getScalaInstance(scalaVersion, log)
val bridge = provider.getCompiledBridge(scalaInstance, log)
val scalaInstance = provider.fetchScalaInstance(scalaVersion, log)
val bridge = provider.fetchCompiledBridge(scalaInstance, log)
val target = targetDir / s"target-bridge-$scalaVersion.jar"
IO.copyFile(bridge, target)
target
@ -56,6 +56,6 @@ abstract class BridgeProviderSpecification extends UnitSpec {
targetDir: File,
logger: Logger): xsbti.compile.ScalaInstance = {
val provider = getZincProvider(targetDir, logger)
provider.getScalaInstance(scalaVersion, logger)
provider.fetchScalaInstance(scalaVersion, logger)
}
}