Update sbt/scala/scalacheck/scalatest deps

Author: mdr

build.sbt

@@ -4,17 +4,17 @@ organization := "com.github.mdr"
 
 version := "0.0.6"
 
-scalaVersion := "2.10.1"
+scalaVersion := "2.12.1"
 
 crossScalaVersions := Seq("2.9.1", "2.9.2", "2.10.1")
 
 scalacOptions ++= Seq("-deprecation")
 
 javacOptions ++= Seq("-source", "1.6", "-target", "1.6")
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "1.9.1" % "test"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"
 
-libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.10.1" % "test"
+libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.13.4" % "test"
 
 // Screen-sized dependency graph:
 // libraryDependencies += "org.vert-x" % "vertx-core" % "1.3.1.final"
@@ -23,12 +23,12 @@ EclipseKeys.withSource := true
 
 EclipseKeys.eclipseOutput := Some("bin")
 
-net.virtualvoid.sbt.graph.Plugin.graphSettings
+//net.virtualvoid.sbt.graph.Plugin.graphSettings
 
-scalariformSettings
+import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 
 ScalariformKeys.preferences <<= baseDirectory.apply { dir => 
-    scalariform.formatter.preferences.PreferencesImporterExporter.loadPreferences((dir / "formatterPreferences.properties").getPath)
+  scalariform.formatter.preferences.PreferencesImporterExporter.loadPreferences((dir / "formatterPreferences.properties").getPath)
 }
 
 publishMavenStyle := true

project/build.properties

@@ -1 +1,2 @@
-sbt.version=0.12.3
+sbt.version=0.13.13
+

project/plugins.sbt

@@ -1,11 +1,10 @@
 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
 
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.3")
-
-// addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4-SNAPSHOT")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8")
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.4.0")
+resolvers += Resolver.typesafeRepo("releases")
+
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.0.1")	

src/main/java/com/github/mdr/ascii/java/ScalaJavaHelper.scala

@@ -1,6 +1,6 @@
 package com.github.mdr.ascii.java
 
-import java.{ util ⇒ ju }
+import java.{util ⇒ ju}
 import scala.collection.JavaConverters._
 import com.github.mdr.ascii.graph.Graph
 import com.github.mdr.ascii.layout.GraphLayout

src/main/scala/com/github/mdr/ascii/diagram/Box.scala

@@ -15,6 +15,6 @@ trait Box extends Container {
       edge ← edges
       if edgeType.includeEdge(edge, this)
       otherBox = edge.otherBox(this)
-    } yield edge -> otherBox
+    } yield edge → otherBox
 
 }

src/main/scala/com/github/mdr/ascii/diagram/parser/DiagramImplementation.scala

@@ -95,10 +95,13 @@ trait DiagramImplementation { self: DiagramParser ⇒
       Region(
         Point(
           points.map(_.row).min,
-          points.map(_.column).min),
+          points.map(_.column).min
+        ),
         Point(
           points.map(_.row).max,
-          points.map(_.column).max))
+          points.map(_.column).max
+        )
+      )
 
   }
 

src/main/scala/com/github/mdr/ascii/diagram/parser/DiagramParser.scala

@@ -35,7 +35,7 @@ class DiagramParser(s: String)
       innerBox ← diagram.allBoxes
       if outerBox != innerBox
       if outerBox.region contains innerBox.region
-    } yield outerBox -> innerBox).toMap
+    } yield outerBox → innerBox).toMap
 
   for {
     (box, containingBoxMap) ← boxContains.groupBy(_._2)

src/main/scala/com/github/mdr/ascii/graph/DiagramToGraphConverter.scala

@@ -17,9 +17,9 @@ object DiagramToGraphConvertor {
         vertex2 ← boxToVertexMap.get(edge.box2)
       } yield {
         if (edge.hasArrow2)
-          vertex1 -> vertex2
+          vertex1 → vertex2
         else
-          vertex2 -> vertex1
+          vertex2 → vertex1
       }
     Graph(vertices, edges)
   }

src/main/scala/com/github/mdr/ascii/layout/GraphLayout.scala

@@ -19,7 +19,8 @@ object GraphLayout {
   def renderGraph[V](
     graph: Graph[V],
     vertexRenderingStrategy: VertexRenderingStrategy[V] = ToStringVertexRenderingStrategy,
-    layoutPrefs: LayoutPrefs = LayoutPrefsImpl()): String = {
+    layoutPrefs: LayoutPrefs = LayoutPrefsImpl()
+  ): String = {
     val cycleRemovalResult = CycleRemover.removeCycles(graph)
     val (layering, _) = new LayeringCalculator[V].assignLayers(cycleRemovalResult)
     val reorderedLayering = LayerOrderingCalculator.reorder(layering)
@@ -30,12 +31,6 @@ object GraphLayout {
       drawing = KinkRemover.removeKinks(drawing)
     if (layoutPrefs.elevateEdges)
       drawing = EdgeElevator.elevateEdges(drawing)
-
-    //    if (layoutPrefs.removeKinks)
-    //      drawing = KinkRemover.removeKinks(drawing)
-    //    if (layoutPrefs.elevateEdges)
-    //      drawing = EdgeElevator.elevateEdges(drawing)
-    //
     if (layoutPrefs.compactify)
       drawing = RedundantRowRemover.removeRedundantRows(drawing)
 

src/main/scala/com/github/mdr/ascii/layout/coordAssign/EdgeBendCalculator.scala

@@ -90,8 +90,8 @@ class EdgeBendCalculator(edgeInfos: List[EdgeInfo], edgeZoneTopRow: Int, selfEdg
         if row1 > row2
         if !swappedEdges.contains((edgeInfo1, edgeInfo2)) // Prevents more involved infinite loops
       } {
-        updatedEdgeToRowMap += edgeInfo1 -> row2
-        updatedEdgeToRowMap += edgeInfo2 -> row1
+        updatedEdgeToRowMap += edgeInfo1 → row2
+        updatedEdgeToRowMap += edgeInfo2 → row1
         swappedEdges += ((edgeInfo1, edgeInfo2))
         continue = true
       }