diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-04-02 03:21:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-02 03:21:42 -0400 |
| commit | 2476e2ec1100813ae4e05cf2183feff8bf5ec8ea (patch) | |
| tree | a334625acfe91c0233abf57a5fb7b52f040e0846 /libraries | |
| parent | e7112d59b811ca4a0bda448a18e0c45cb4841abb (diff) | |
| parent | c220ef8d12e77ce6af6fafde3b388fc3e334b380 (diff) | |
| download | cbt-2476e2ec1100813ae4e05cf2183feff8bf5ec8ea.tar.gz cbt-2476e2ec1100813ae4e05cf2183feff8bf5ec8ea.tar.bz2 cbt-2476e2ec1100813ae4e05cf2183feff8bf5ec8ea.zip | |
Merge pull request #471 from cvogt/2.12-ready
2.12 ready
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/common-1/build/build.scala | 2 | ||||
| -rw-r--r-- | libraries/eval/build/build/build.scala | 5 | ||||
| -rw-r--r-- | libraries/file/build/build.scala | 2 | ||||
| -rw-r--r-- | libraries/file/file.scala | 12 | ||||
| -rw-r--r-- | libraries/reflect/build/build.scala | 2 |
5 files changed, 9 insertions, 14 deletions
diff --git a/libraries/common-1/build/build.scala b/libraries/common-1/build/build.scala index 247fd01..3d7868d 100644 --- a/libraries/common-1/build/build.scala +++ b/libraries/common-1/build/build.scala @@ -4,5 +4,5 @@ import cbt_internal._ class Build(val context: Context) extends Library{ override def inceptionYear = 2017 override def description = "classes shared by multiple cbt libraries and needed in stage 1" - override def dependencies = super.dependencies :+ libraries.common_0 :+ libraries.interfaces + override def dependencies = super.dependencies :+ libraries.cbt.common_0 :+ libraries.cbt.interfaces } diff --git a/libraries/eval/build/build/build.scala b/libraries/eval/build/build/build.scala deleted file mode 100644 index af4eb64..0000000 --- a/libraries/eval/build/build/build.scala +++ /dev/null @@ -1,5 +0,0 @@ -import cbt._ - -class Build(val context: Context) extends BuildBuild{ - override def dependencies = super.dependencies :+ plugins.scalaTest -} diff --git a/libraries/file/build/build.scala b/libraries/file/build/build.scala index d9017a1..eb7cabf 100644 --- a/libraries/file/build/build.scala +++ b/libraries/file/build/build.scala @@ -4,5 +4,5 @@ import cbt_internal._ class Build(val context: Context) extends Library{ override def inceptionYear = 2017 override def description = "helpers to work with java io and nio" - override def dependencies = super.dependencies :+ libraries.common_1 + override def dependencies = super.dependencies :+ libraries.cbt.common_1 } 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/libraries/reflect/build/build.scala b/libraries/reflect/build/build.scala index 3b6658a..77e0460 100644 --- a/libraries/reflect/build/build.scala +++ b/libraries/reflect/build/build.scala @@ -4,5 +4,5 @@ import cbt_internal._ class Build(val context: Context) extends Library{ override def inceptionYear = 2017 override def description = "discover classes on your classpath and invoke methods reflectively, preventing System.exit" - override def dependencies = super.dependencies :+ libraries.file :+ libraries.common_1 + override def dependencies = super.dependencies :+ libraries.cbt.file :+ libraries.cbt.common_1 } |