Compile for scala js and update to scala 2.13.1 (#78)

benderpremier · BusyByte · commit b5147811d0f5 · 2020-01-17T01:15:52.000-06:00
* cross compile for scalaJS

* update to scala 2.13.1

* update travis
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 dist: trusty
 language: scala
 scala:
-   - 2.12.8
+   - 2.13.1
 jdk:
   - openjdk11
 cache:
diff --git a/build.sbt b/build.sbt
@@ -1,26 +1,25 @@
 import org.scalafmt.sbt.ScalafmtPlugin.autoImport._
+import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 
 lazy val commonSettings = Seq(
     organization := "com.github.aimacode.aima-scala",
     version := "0.1.0-SNAPSHOT",
-    scalaVersion := "2.12.8",
+    scalaVersion := "2.13.1",
     scalafmtConfig := file(".scalafmt"),
     scalafmtOnCompile := true,
     coverageEnabled := false,
     coverageMinimum := 70,
     coverageFailOnMinimum := false,
     autoCompilerPlugins := true
-  ) 
+  )
 
-lazy val librarySettings = Seq(
-  "org.specs2"     %% "specs2-core"       % "3.8.6"  % Test,
-  "org.specs2"     %% "specs2-scalacheck" % "3.8.6"  % Test,
-  "org.scalacheck" %% "scalacheck"        % "1.13.4" % Test
-)
-
-lazy val root = (project in file(".")).settings(commonSettings: _*).aggregate(core)
+lazy val root = (project in file("."))
+  .settings(commonSettings: _*)
+  .aggregate(core.jvm, core.js)
 
-lazy val core = (project in file("core"))
+lazy val core = crossProject(JSPlatform, JVMPlatform)
+  .crossType(CrossType.Pure)
+  .in(file("core"))
   .settings(commonSettings: _*)
   .settings(name := "core")
-  .settings(libraryDependencies ++= librarySettings)
+  .settings(dependencies.commonDependencies)
diff --git a/core/src/main/scala/aima/core/agent/basic/LRTAStarAgent.scala b/core/src/main/scala/aima/core/agent/basic/LRTAStarAgent.scala
@@ -4,6 +4,7 @@ import aima.core.agent.StatelessAgent
 import aima.core.agent.basic.LRTAStarAgent.IdentifyState
 import aima.core.agent.basic.LRTAStarAgentState.{COST_ESTIMATES, RESULT}
 import aima.core.search.api.OnlineSearchProblem
+import Ordering.Double.TotalOrdering
 
 /**
   *
diff --git a/core/src/main/scala/aima/core/environment/map2d/Map2DFunctionFactory.scala b/core/src/main/scala/aima/core/environment/map2d/Map2DFunctionFactory.scala
@@ -1,6 +1,7 @@
 package aima.core.environment.map2d
 
 import aima.core.search.CostNode
+import Ordering.Double.TotalOrdering
 
 /**
   * @author Shawn Garner
diff --git a/core/src/main/scala/aima/core/search/informed/RecursiveBestFirstSearch.scala b/core/src/main/scala/aima/core/search/informed/RecursiveBestFirstSearch.scala
@@ -1,6 +1,7 @@
 package aima.core.search.informed
 
 import aima.core.search.{HeuristicsNode, Problem, ProblemSearch}
+import Ordering.Double.TotalOrdering
 
 import scala.annotation.tailrec
 import scala.reflect.ClassTag
diff --git a/core/src/main/scala/aima/core/search/local/HillClimbing.scala b/core/src/main/scala/aima/core/search/local/HillClimbing.scala
@@ -1,6 +1,7 @@
 package aima.core.search.local
 
 import aima.core.search.Problem
+import Ordering.Double.TotalOrdering
 
 import scala.annotation.tailrec
 
diff --git a/core/src/main/scala/aima/core/search/uninformed/frontier.scala b/core/src/main/scala/aima/core/search/uninformed/frontier.scala
@@ -14,7 +14,7 @@ class FIFOQueueFrontier[State, Action, Node <: SearchNode[State, Action]](queue:
     case (leaf, updatedQueue) => (leaf, new FIFOQueueFrontier[State, Action, Node](updatedQueue, stateSet - leaf.state))
   }
   def addAll(iterable: Iterable[Node]): Frontier[State, Action, Node] =
-    new FIFOQueueFrontier(queue.enqueue(iterable), stateSet ++ iterable.map(_.state))
+    new FIFOQueueFrontier(queue.enqueueAll(iterable), stateSet ++ iterable.map(_.state))
   def contains(state: State): Boolean = stateSet.contains(state)
 
   def replaceByState(node: Node): Frontier[State, Action, Node] = {
diff --git a/core/src/test/scala/aima/core/environment/vacuum/ModelBasedReflexVacuumAgentSpec.scala b/core/src/test/scala/aima/core/environment/vacuum/ModelBasedReflexVacuumAgentSpec.scala
@@ -57,7 +57,7 @@ class ModelBasedReflexVacuumAgentSpec extends Specification {
   }
 
   "should do nothing if low on power" in new context {
-    val resultStream = Stream.continually(agent.agentFunction.apply(DirtyPercept))
+    val resultStream = LazyList.continually(agent.agentFunction.apply(DirtyPercept))
     resultStream.take(100).last must beLike {
       case NoAction => ok
     }
diff --git a/core/src/test/scala/aima/core/environment/vacuum/TableDrivenVacuumAgentSpec.scala b/core/src/test/scala/aima/core/environment/vacuum/TableDrivenVacuumAgentSpec.scala
@@ -66,7 +66,7 @@ class TableDrivenVacuumAgentSpec extends Specification {
 
   "table driven agent must persist all percepts" in new context {
     val rnd = new Random()
-    val randomPerceptStream: Stream[VacuumPercept] = Stream.continually {
+    val randomPerceptStream: LazyList[VacuumPercept] = LazyList.continually {
       val selector = rnd.nextInt(3)
       if (selector == 0)
         LocationPercept.randomValue
diff --git a/core/src/test/scala/aima/core/environment/vacuum/VacuumMapSpec.scala b/core/src/test/scala/aima/core/environment/vacuum/VacuumMapSpec.scala
@@ -51,14 +51,14 @@ class VacuumMapSpec extends Specification with ScalaCheck {
     val agent = noopAgent
     val map   = VacuumMap(Vector(dirtyNode, dirtyNode)).addAgent(agent)
 
-    map.getDirtStatus(agent) must beSome(DirtyPercept)
+    map.getDirtStatus(agent) must beSome[VacuumPercept](DirtyPercept)
   }
 
   "dirt status of agent must be clean if all clean" in {
     val agent = noopAgent
     val map   = VacuumMap(Vector(cleanNode, cleanNode)).addAgent(agent)
 
-    map.getDirtStatus(agent) must beSome(CleanPercept)
+    map.getDirtStatus(agent) must beSome[VacuumPercept](CleanPercept)
   }
 
   "agent location of agent not on map must be none" in prop { map: VacuumMap =>
@@ -70,34 +70,38 @@ class VacuumMapSpec extends Specification with ScalaCheck {
     val agent = noopAgent
     val map   = VacuumMap(Vector(agentNode(agent), cleanNode)).addAgent(agent)
 
-    map.getAgentLocation(agent) must beSome(LocationAPercept)
+    map.getAgentLocation(agent) must beSome[VacuumPercept](LocationAPercept)
   }
 
   "agent location must be B if in second spot" in {
     val agent = noopAgent
     val map   = VacuumMap(Vector(cleanNode, agentNode(agent))).addAgent(agent)
 
-    map.getAgentLocation(agent) must beSome(LocationBPercept)
+    map.getAgentLocation(agent) must beSome[VacuumPercept](LocationBPercept)
   }
 
   "moving right will put in spot B" in prop { map: VacuumMap =>
     val agent = noopAgent
-    map.addAgent(agent).moveAgent(agent, RightMoveAction).getAgentLocation(agent) must beSome(LocationBPercept)
+    map.addAgent(agent).moveAgent(agent, RightMoveAction).getAgentLocation(agent) must beSome[VacuumPercept](
+      LocationBPercept
+    )
   }
 
   "moving left will put in spot A" in prop { map: VacuumMap =>
     val agent = noopAgent
-    map.addAgent(agent).moveAgent(agent, LeftMoveAction).getAgentLocation(agent) must beSome(LocationAPercept)
+    map.addAgent(agent).moveAgent(agent, LeftMoveAction).getAgentLocation(agent) must beSome[VacuumPercept](
+      LocationAPercept
+    )
   }
 
   "updating dirt status of dirty will return dirt percept of dirty" in prop { map: VacuumMap =>
     val agent = noopAgent
-    map.addAgent(agent).updateStatus(agent, DirtyPercept).getDirtStatus(agent) must beSome(DirtyPercept)
+    map.addAgent(agent).updateStatus(agent, DirtyPercept).getDirtStatus(agent) must beSome[VacuumPercept](DirtyPercept)
   }
 
   "updating dirt status of clean will return clean percept of dirty" in prop { map: VacuumMap =>
     val agent = noopAgent
-    map.addAgent(agent).updateStatus(agent, CleanPercept).getDirtStatus(agent) must beSome(CleanPercept)
+    map.addAgent(agent).updateStatus(agent, CleanPercept).getDirtStatus(agent) must beSome[VacuumPercept](CleanPercept)
   }
 
   "removing agent must have no location percept" in prop { map: VacuumMap =>
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.3
diff --git a/project/dependencies.scala b/project/dependencies.scala
@@ -0,0 +1,15 @@
+import sbt._
+import Keys._
+import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
+import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
+
+object dependencies {
+  val specs2 = "4.8.1"
+  val scalacheck = "1.14.2"
+
+  def commonDependencies =  Seq(libraryDependencies ++=  Seq(
+    "org.specs2"     %%% "specs2-core"       % specs2  % Test,
+    "org.specs2"     %%% "specs2-scalacheck" % specs2   % Test,
+    "org.scalacheck" %%% "scalacheck"        % scalacheck  % Test
+  ))
+}
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,5 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.6")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.6")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.31")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "0.6.1")

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import aima.core.agent.StatelessAgent`
`4`	`4`	`import aima.core.agent.basic.LRTAStarAgent.IdentifyState`
`5`	`5`	`import aima.core.agent.basic.LRTAStarAgentState.{COST_ESTIMATES, RESULT}`
`6`	`6`	`import aima.core.search.api.OnlineSearchProblem`
	`7`	`+import Ordering.Double.TotalOrdering`
`7`	`8`
`8`	`9`	`/**`
`9`	`10`	`*`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class FIFOQueueFrontier[State, Action, Node <: SearchNode[State, Action]](queue:`
`14`	`14`	`case (leaf, updatedQueue) => (leaf, new FIFOQueueFrontier[State, Action, Node](updatedQueue, stateSet - leaf.state))`
`15`	`15`	`}`
`16`	`16`	`def addAll(iterable: Iterable[Node]): Frontier[State, Action, Node] =`
`17`		`- new FIFOQueueFrontier(queue.enqueue(iterable), stateSet ++ iterable.map(_.state))`
	`17`	`+ new FIFOQueueFrontier(queue.enqueueAll(iterable), stateSet ++ iterable.map(_.state))`
`18`	`18`	`def contains(state: State): Boolean = stateSet.contains(state)`
`19`	`19`
`20`	`20`	`def replaceByState(node: Node): Frontier[State, Action, Node] = {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class ModelBasedReflexVacuumAgentSpec extends Specification {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`"should do nothing if low on power" in new context {`
`60`		`- val resultStream = Stream.continually(agent.agentFunction.apply(DirtyPercept))`
	`60`	`+ val resultStream = LazyList.continually(agent.agentFunction.apply(DirtyPercept))`
`61`	`61`	`resultStream.take(100).last must beLike {`
`62`	`62`	`case NoAction => ok`
`63`	`63`	`}`