-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump to Scala 2.13 and dependencies (#15)
* Bump to Scala 2.13 * Replace one-jar with sbt-assembly
- Loading branch information
1 parent
b08e4c9
commit f35f3f7
Showing
7 changed files
with
40 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,28 @@ | ||
import Dependencies._ | ||
import com.github.retronym.SbtOneJar._ | ||
name := "Conway's Game of Life" | ||
version := conwaysVersion | ||
organization := "org.juanitodread" | ||
|
||
oneJarSettings | ||
scalaVersion := "2.13.6" | ||
|
||
lazy val root = (project in file(".")). | ||
settings( | ||
name := "Conway's Game of Life", | ||
version := "1.1.2", | ||
organization := "org.juanitodread", | ||
scalaVersion := "2.11.11" | ||
). | ||
settings( | ||
libraryDependencies ++= backendDeps | ||
).settings( | ||
scalacOptions += "-feature" | ||
).settings( | ||
fork := true, // Enabling fork JVM to send the Java parameter that uses another sort algorithm | ||
javaOptions ++= Seq("-Djava.util.Arrays.useLegacyMergeSort=true") | ||
) | ||
lazy val root = project in file(".") | ||
|
||
lazy val conwaysVersion = "1.2.0" | ||
lazy val scalaSwingVersion = "3.0.0" | ||
lazy val scalaLoggingVersion = "3.9.4" | ||
lazy val logbackVersion = "1.2.6" | ||
lazy val scalaTestVersion = "3.2.9" | ||
|
||
libraryDependencies ++= Seq( | ||
"org.scala-lang.modules" %% "scala-swing" % scalaSwingVersion, | ||
"com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion, | ||
"ch.qos.logback" % "logback-classic" % logbackVersion, | ||
"org.scalatest" %% "scalatest" % scalaTestVersion % "test", | ||
) | ||
|
||
scalacOptions += "-feature" | ||
|
||
fork := true // Enabling fork JVM to send the Java parameter that uses another sort algorithm | ||
javaOptions ++= Seq("-Djava.util.Arrays.useLegacyMergeSort=true") | ||
|
||
mainClass := Some("org.juanitodread.conwaygameoflife.MainApp") | ||
assemblyJarName := s"conways-game-of-life_${conwaysVersion}.jar" |
Binary file not shown.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
sbt.version = 0.13.9 | ||
sbt.version=1.3.13 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,7 @@ | ||
// Scalariform | ||
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0") | ||
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2") | ||
|
||
// Scoverage | ||
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") | ||
|
||
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "3.0.0") | ||
addSbtPlugin("org.scala-sbt.plugins" % "sbt-onejar" % "0.8") | ||
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 7 additions & 2 deletions
9
src/test/scala/org/juanitodread/conwaygameoflife/UnitSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,11 @@ | ||
package org.juanitodread.conwaygameoflife | ||
|
||
import org.scalatest._ | ||
import flatspec._ | ||
import matchers._ | ||
|
||
abstract class UnitSpec extends FlatSpec | ||
with Matchers with OptionValues with Inside with Inspectors | ||
abstract class UnitSpec extends AnyFlatSpec | ||
with should.Matchers | ||
with OptionValues | ||
with Inside | ||
with Inspectors |