From 11fa775ef85458fd39f93d16bdd53a25496502d2 Mon Sep 17 00:00:00 2001 From: jvican Date: Fri, 26 May 2017 15:32:29 +0200 Subject: [PATCH] Rename `getXXX` by `fetchXXX` As suggested by Eugene. --- .../scala/sbt/internal/inc/ZincComponentCompiler.scala | 8 ++++---- .../sbt/internal/inc/BridgeProviderSpecification.scala | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala b/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala index aac0945f4..ae43d3eb5 100644 --- a/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala +++ b/internal/zinc-ivy-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala @@ -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 diff --git a/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala b/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala index 2d6e1748e..6eebed1cf 100644 --- a/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala +++ b/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala @@ -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) } }