Scala 2.12 & dependency updates

.travis.yml

@@ -1,13 +1,26 @@
 language: scala
+
+jdk:
+ - oraclejdk8
+
 install:
  - sudo pip install pygments
  - gem install jekyll
  - gem install redcarpet
  - gem install pygments.rb
+ - . $HOME/.nvm/nvm.sh
+ - nvm install stable
+ - nvm use stable
+ - npm install
+ - npm install jsdom
+
 scala:
- - 2.11.6
+ - 2.12.1
+ - 2.11.8
+
 script:
  - sbt genalgoJS/test coverage genalgoJVM/test
+
 after_success:
  - sbt genalgoJVM/coveralls
  - 'if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then bash ./deploy.sh; fi'

build.sbt

@@ -1,16 +1,15 @@
 import com.typesafe.sbt.site.JekyllSupport
 import sbt.Keys._
 import sbt._
-import bintray.Plugin.bintraySettings
 
 import scala.io.Source
 
-import scoverage.ScoverageSbtPlugin.ScoverageKeys.coverage
-
 import com.typesafe.sbt.SbtSite.SiteKeys._
 
 name := "genalgo"
 
+scalaVersion := "2.12.1"
+
 lazy val root = project.in(file(".")).
  aggregate(genalgoJS, genalgoJVM).
  settings(
@@ -19,7 +18,8 @@ lazy val root = project.in(file(".")).
  )
 
 lazy val sharedSettings = Seq(
- scalaVersion := "2.11.6",
+ scalaVersion := "2.12.1",
+ crossScalaVersions := Seq("2.12.1", "2.11.8"),
  version := "0.1.4-SNAPSHOT",
  licenses += ("MIT", url("http://opensource.org/licenses/MIT"))
 )
@@ -56,27 +56,26 @@ def resourceGenerator(folder: String, sourceType: String, outputPackage: Seq[Str
 lazy val genalgoSettings = sharedSettings ++ Seq(
  organization := "me.shadaj",
  name := "genalgo",
- libraryDependencies += "com.lihaoyi" %%% "utest" % "0.3.0" % Test,
+ libraryDependencies += "com.lihaoyi" %%% "utest" % "0.4.5" % Test,
  testFrameworks += new TestFramework("utest.runner.Framework"),
- sourceGenerators in Compile <+= resourceGenerator("gen", "main", Seq("me", "shadaj", "genalgo")),
- cleanFiles <+= baseDirectory { base => base / ".." / "shared" / "src" / "gen" },
- sourceGenerators in Test <+= resourceGenerator("testGen", "test", Seq("me", "shadaj", "genalgo", "tests")),
- cleanFiles <+= baseDirectory { base => base / ".." / "shared" / "src" / "testGen" }
-) ++ bintraySettings ++ bintrayPublishSettings
+ sourceGenerators in Compile +=  {resourceGenerator("gen", "main", Seq("me", "shadaj", "genalgo"))}.taskValue,
+ cleanFiles += { baseDirectory { base => base / ".." / "shared" / "src" / "gen" }.value },
+ sourceGenerators in Test +=  { resourceGenerator("testGen", "test", Seq("me", "shadaj", "genalgo", "tests"))}.taskValue,
+ cleanFiles += { baseDirectory { base => base / ".." / "shared" / "src" / "testGen" }.value }
+)
 
 lazy val genalgo = crossProject.in(file(".")).
  settings(genalgoSettings: _*).
  jvmSettings(
- libraryDependencies += "net.databinder.dispatch" %% "dispatch-core" % "0.11.2",
- libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.10" % Test,
- libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.11.6" % Test
+ libraryDependencies += "net.databinder.dispatch" %% "dispatch-core" % "0.12.0",
+ libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.23" % Test,
+ libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.13.4" % Test
  ).
  jsSettings(
  jsDependencies += RuntimeDOM,
  jsDependencies += ProvidedJS / "bio-pv.min.js" % Test,
- preLinkJSEnv := PhantomJSEnv().value,
- postLinkJSEnv := PhantomJSEnv().value,
- libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "0.8.0"
+ jsEnv := PhantomJSEnv().value,
+ libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "0.9.1"
  )
 
 lazy val genalgoJVM = genalgo.jvm
@@ -86,15 +85,6 @@ lazy val demosSettings = sharedSettings ++ Seq(persistLauncher in Compile := tru
 
 lazy val demos = project.settings(demosSettings: _*).enablePlugins(ScalaJSPlugin).dependsOn(genalgo.js)
 
-coverage := {
- coverage.value
- def fileToMkdir = {
- val pathForRoot = new File("").toPath.toAbsolutePath.toString
- s"$pathForRoot/jvm/target/scala-2.11/scoverage-report$pathForRoot/jvm"
- }
- new File(fileToMkdir).mkdirs
-}
-
 site.settings
 
 site.addMappingsToSiteDir(mappings in packageDoc in Compile in genalgoJS, "js/latest/api")
@@ -103,8 +93,8 @@ site.addMappingsToSiteDir(mappings in packageDoc in Compile in genalgoJVM, "jvm/
 site.jekyllSupport()
 
 siteMappings ++= Seq(
- baseDirectory.value / "demos" / "target" / "scala-2.11" / "demos-opt.js" -> "demos-opt.js",
- baseDirectory.value / "demos" / "target" / "scala-2.11" / "demos-launcher.js" -> "demos-launcher.js"
+ (crossTarget in Compile in demos).value / "demos-opt.js" -> "demos-opt.js",
+ (crossTarget in Compile in demos).value / "demos-launcher.js" -> "demos-launcher.js"
 )
 
 includeFilter in JekyllSupport.Jekyll ~= { _ || "*.svg" }

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.13

project/plugins.sbt

@@ -1,14 +1,15 @@
-resolvers += Resolver.url(
- "bintray-sbt-plugin-releases",
- url("http://dl.bintray.com/content/sbt/sbt-plugin-releases"))(
- Resolver.ivyStylePatterns)
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.2")
+addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
 
-addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.2")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")
 
-addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0.BETA1")
+addSbtPlugin("com.gilt" % "sbt-dependency-graph-sugar" % "0.8.2") // visual dependency management
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.1")
+addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
+
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.0")
+
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15-1")

shared/src/test/scala/me/shadaj/genalgo/tests/UniprotTest.scala

@@ -3,7 +3,7 @@ package me.shadaj.genalgo.tests
 import utest._
 
 import me.shadaj.genalgo.uniprot.Uniprot
-import utest.ExecutionContext.RunNow
+import utest.framework.ExecutionContext.RunNow
 
 object UniprotTest extends TestSuite {
  val tests = TestSuite {