raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Make CrossVersion.full work with custom scala versions

Browse source
This commit is contained in:
Martynas Mickevičius 2016-02-18 11:15:24 +02:00
parent 1200ff2df3
commit bd215f2844
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
project/Dependencies.scala
View file

@ -174,7 +174,7 @@ object Dependencies {
DependencyHelpers.versionDependentDeps( DependencyHelpers.versionDependentDeps(
Dependencies.Compile.scalaReflect % "provided" Dependencies.Compile.scalaReflect % "provided"
), ),
addCompilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full) addCompilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.fullMapped(nominalScalaVersion))
) )
lazy val httpTestkit = l ++= Seq( lazy val httpTestkit = l ++= Seq(
@ -223,4 +223,15 @@ object DependencyHelpers {
*/ */
def versionDependentDeps(modules: ScalaVersionDependentModuleID*): Def.Setting[Seq[ModuleID]] = def versionDependentDeps(modules: ScalaVersionDependentModuleID*): Def.Setting[Seq[ModuleID]] =
libraryDependencies <++= scalaVersion(version => modules.flatMap(m => m.modules(version))) libraryDependencies <++= scalaVersion(version => modules.flatMap(m => m.modules(version)))
val ScalaVersion = """\d\.\d+\.\d+(?:-(?:M|RC)\d+)?""".r
val nominalScalaVersion: String => String = {
// matches:
// 2.12.0-M1
// 2.12.0-RC1
// 2.12.0
case version @ ScalaVersion() => version
// transforms 2.12.0-custom-version to 2.12.0
case version => version.takeWhile(_ != '-')
}
} }