Merge pull request #149 from Atry/scala-2.12.3-wip

Upgrade to Scala 2.12.3

Author: Atry

build.sbt

@@ -152,4 +152,4 @@ lazy val unidoc =
 
 organization in ThisBuild := "com.thoughtworks.deeplearning"
 
-crossScalaVersions := Seq("2.11.11", "2.12.2")
+crossScalaVersions := Seq("2.11.11", "2.12.3")

plugins-Builtins/src/main/scala-2.12/com/thoughtworks/deeplearning/plugins/Builtins.scala

@@ -14,18 +14,24 @@ trait Builtins
     with FloatTraining
     with FloatLiterals
     with FloatWeights
+    with FloatLayers
+    with CumulativeFloatLayers
     with DoubleTraining
     with DoubleLiterals
-    with DoubleWeights {
+    with DoubleWeights
+    with DoubleLayers
+    with CumulativeDoubleLayers {
 
   trait ImplicitsApi
       extends super[Layers].ImplicitsApi
       with super[Weights].ImplicitsApi
       with super[Operators].ImplicitsApi
       with super[FloatTraining].ImplicitsApi
       with super[FloatLiterals].ImplicitsApi
+      with super[FloatLayers].ImplicitsApi
       with super[DoubleTraining].ImplicitsApi
       with super[DoubleLiterals].ImplicitsApi
+      with super[DoubleLayers].ImplicitsApi
 
   type Implicits <: ImplicitsApi
 

plugins-CumulativeFloatLayers/src/main/scala-2.11/com/thoughtworks/deeplearning/plugins/CumulativeFloatLayers.scala renamed to plugins-CumulativeFloatLayers/src/main/scala/com/thoughtworks/deeplearning/plugins/CumulativeFloatLayers.scala

@@ -1,3 +1,3 @@
 addSbtPlugin("com.thoughtworks.sbt-best-practice" % "sbt-best-practice" % "2.5.0")
 
-addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "2.0.1")
+addSbtPlugin("com.thoughtworks.example" % "sbt-example" % "2.0.2")