diff options
-rw-r--r-- | libraries/file/file.scala | 12 | ||||
-rw-r--r-- | plugins/scalariform/build/build.scala | 6 | ||||
-rw-r--r-- | ports/scalariform/build/build.scala | 26 | ||||
-rw-r--r-- | ports/scalariform/build/build/build.scala | 5 | ||||
-rw-r--r-- | stage2/ports.scala | 1 |
5 files changed, 39 insertions, 11 deletions
diff --git a/libraries/file/file.scala b/libraries/file/file.scala index f20c9a8..900e9ec 100644 --- a/libraries/file/file.scala +++ b/libraries/file/file.scala @@ -83,12 +83,12 @@ trait Module { val duplicateFiles = ( relatives diff relatives.distinct ).distinct assert( duplicateFiles.isEmpty, { - val rs = relatives.toSet - "Conflicting:\n\n" + - map.filter( rs contains _._2 ).groupBy( _._2 ).mapValues( _.map( _._1 ).sorted ).toSeq.sortBy( _._1 ).map { - case ( name, files ) => s"$name:\n" ++ files.mkString( "\n" ) - }.mkString( "\n\n" ) - } + val rs = relatives.toSet + "Conflicting:\n\n" + + map.filter( rs contains _._2 ).groupBy( _._2 ).mapValues( _.map( _._1 ).sorted ).toSeq.sortBy( _._1 ).map { + case ( name, files ) => s"$name:\n" ++ files.mkString( "\n" ) + }.mkString( "\n\n" ) + } ) } map diff --git a/plugins/scalariform/build/build.scala b/plugins/scalariform/build/build.scala index 5910b41..80f3966 100644 --- a/plugins/scalariform/build/build.scala +++ b/plugins/scalariform/build/build.scala @@ -1,9 +1,5 @@ import cbt._ class Build(val context: Context) extends Plugin { - override def dependencies = - super.dependencies ++ - Resolver( mavenCentral ).bind( - ScalaDependency("org.scalariform", "scalariform", "0.1.8") - ) + override def dependencies = super.dependencies :+ ports.scalariform } diff --git a/ports/scalariform/build/build.scala b/ports/scalariform/build/build.scala new file mode 100644 index 0000000..c2ade6b --- /dev/null +++ b/ports/scalariform/build/build.scala @@ -0,0 +1,26 @@ +package migration_manager_build +import cbt._ +class Build(val context: Context) extends AdvancedScala{ outer => + override def dependencies = Seq( libraries.scala.xml, libraries.scala.parserCombinators ) + + val scalariform = GitDependency.checkout( + "https://github.com/scala-ide/scalariform.git", "f53978c60579fa834ac9e56986a6133c0a621bfd" + ) + + override def sources = Seq( + scalariform / "scalariform" / "src" / "main" / "scala" / "scalariform" + ) + + override def scalacOptions = super.scalacOptions ++ Seq( + "-language:implicitConversions", "-language:reflectiveCalls" + ) + + override def test = new BasicBuild( context ) with ScalaTest{ + override def target = outer.target / "test" + override def dependencies = super.dependencies :+ outer + override def scalacOptions = outer.scalacOptions + override def sources = Seq( + scalariform / "scalariform" / "src" / "test" / "scala" / "scalariform" + ) + } +} diff --git a/ports/scalariform/build/build/build.scala b/ports/scalariform/build/build/build.scala new file mode 100644 index 0000000..d9eecf9 --- /dev/null +++ b/ports/scalariform/build/build/build.scala @@ -0,0 +1,5 @@ +package scalariform_build.build +import cbt._ +class Build(val context: Context) extends BuildBuild{ + override def dependencies = super.dependencies :+ plugins.scalaTest +} diff --git a/stage2/ports.scala b/stage2/ports.scala index e7e3863..460a255 100644 --- a/stage2/ports.scala +++ b/stage2/ports.scala @@ -8,4 +8,5 @@ class ports( context: Context, scalaVersion: String ) { None ) def mima = dep( "migration-manager" ) + def scalariform = dep( "scalariform" ) } |