Merge pull request #17 from sparsetech/feat/update-deps-2

Build: Update dependencies
sparsetech · Sep 26, 2020 · 8f470c4 · 8f470c4
2 parents 12aabec + 602e300
commit 8f470c4
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 27 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -2,8 +2,10 @@ kind: pipeline
 name: default
 steps:
   - name: test
-    image: tindzk/seed:0.1.5
+    image: tindzk/seed:0.1.7
     commands:
+      # Patch Bloop version to support Scala.js 1.0
+      - apk add --no-cache curl && curl -L https://github.com/scalacenter/bloop/releases/download/v1.4.0-RC1/install.py | python - -d /usr/bin/ -v 1.4.0-RC1-229-b7c15aa9 || true
       - blp-server &
       - seed --build=build211.toml bloop
       - sleep 5  # Synchronise analysis.bin files, otherwise rm might fail

diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: scala
 scala:
   - 2.11.12
   - 2.12.10
-  - 2.13.1
+  - 2.13.3
 jdk:
   - openjdk8
 

diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 val Scala2_11  = "2.11.12"
 val Scala2_12  = "2.12.10"
-val Scala2_13  = "2.13.1"
-val ScalaTest  = "3.0.8"
+val Scala2_13  = "2.13.3"
+val ScalaTest  = "3.2.2"
 
 val SharedSettings = Seq(
   name := "translit-scala",
@@ -44,7 +44,8 @@ lazy val translit = crossProject.in(file("."))
     autoAPIMappings := true,
     apiMappings += (scalaInstance.value.libraryJar -> url(s"http://www.scala-lang.org/api/${scalaVersion.value}/")),
     libraryDependencies ++= Seq(
-      "org.scalatest" %%% "scalatest" % ScalaTest % "test"
+      "org.scalatest" %%% "scalatest" % ScalaTest % "test",
+      "org.scalatest" %%% "scalatest-funsuite" % ScalaTest % "test"
     )
   )
   .jsSettings(
@@ -53,7 +54,7 @@ lazy val translit = crossProject.in(file("."))
   )
   .jvmSettings(
     libraryDependencies ++= Seq(
-      "com.github.pathikrit" %%% "better-files" % "3.8.0" % "test",
+      "com.github.pathikrit" %%% "better-files" % "3.9.1" % "test",
       "org.scalaj" %%% "scalaj-http" % "2.4.2" % "test"
     )
   )

diff --git a/build211.toml b/build211.toml
@@ -1,7 +1,7 @@
 [project]
 scalaVersion       = "2.11.12"
-scalaJsVersion     = "0.6.28"
-scalaNativeVersion = "0.3.9"
+scalaJsVersion     = "1.0.1"
+scalaNativeVersion = "0.4.0-M2"
 scalaOptions       = [
   "-encoding", "UTF-8",
   "-unchecked",
@@ -29,17 +29,17 @@ targets   = ["js", "jvm", "native"]
 [module.translit.test.jvm]
 sources   = ["jvm/src/test/scala"]
 scalaDeps = [
-  ["org.scalatest", "scalatest", "3.0.8"],
-  ["com.github.pathikrit", "better-files", "3.8.0"],
+  ["org.scalatest", "scalatest", "3.2.2"],
+  ["com.github.pathikrit", "better-files", "3.9.1"],
   ["org.scalaj", "scalaj-http", "2.4.2"]
 ]
 
 [module.translit.test.js]
 scalaDeps = [
-  ["org.scalatest", "scalatest", "3.0.8"]
+  ["org.scalatest", "scalatest", "3.1.1"]
 ]
 
 [module.translit.test.native]
 scalaDeps = [
-  ["org.scalatest", "scalatest", "3.2.0-SNAP10"]
+  ["org.scalatest", "scalatest", "3.2.2"]
 ]
diff --git a/build212.toml b/build212.toml
@@ -1,6 +1,6 @@
 [project]
-scalaVersion   = "2.12.10"
-scalaJsVersion = "0.6.28"
+scalaVersion   = "2.12.12"
+scalaJsVersion = "1.0.1"
 scalaOptions   = [
   "-encoding", "UTF-8",
   "-unchecked",
@@ -25,12 +25,12 @@ root = "jvm"
 sources   = ["shared/src/test/scala"]
 targets   = ["js", "jvm"]
 scalaDeps = [
-  ["org.scalatest", "scalatest", "3.0.8"]
+  ["org.scalatest", "scalatest", "3.1.1"]
 ]
 
 [module.translit.test.jvm]
 sources   = ["jvm/src/test/scala"]
 scalaDeps = [
-  ["com.github.pathikrit", "better-files", "3.8.0"],
+  ["com.github.pathikrit", "better-files", "3.9.1"],
   ["org.scalaj", "scalaj-http", "2.4.2"]
 ]
diff --git a/build213.toml b/build213.toml
@@ -1,6 +1,6 @@
 [project]
 scalaVersion   = "2.13.1"
-scalaJsVersion = "0.6.28"
+scalaJsVersion = "1.0.1"
 scalaOptions   = [
   "-encoding", "UTF-8",
   "-unchecked",
@@ -25,12 +25,12 @@ root = "jvm"
 sources   = ["shared/src/test/scala"]
 targets   = ["js", "jvm"]
 scalaDeps = [
-  ["org.scalatest", "scalatest", "3.0.8"]
+  ["org.scalatest", "scalatest", "3.1.1"]
 ]
 
 [module.translit.test.jvm]
 sources   = ["jvm/src/test/scala"]
 scalaDeps = [
-  ["com.github.pathikrit", "better-files", "3.8.0"],
+  ["com.github.pathikrit", "better-files", "3.9.1"],
   ["org.scalaj", "scalaj-http", "2.4.2"]
 ]
diff --git a/jvm/src/test/scala/translit/CorpusSpec.scala b/jvm/src/test/scala/translit/CorpusSpec.scala
@@ -3,10 +3,10 @@ package translit
 import java.nio.charset.Charset
 
 import better.files._
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 import scalaj.http.Http
 
-class CorpusSpec extends FunSuite {
+class CorpusSpec extends AnyFunSuite {
   def getDump(name: String): File = {
     val file = File(s"/tmp/$name")
     if (file.exists) file

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.3.3
+sbt.version = 1.3.13
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,4 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs"  % "0.6.29")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.0.0")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.2.0")
diff --git a/shared/src/test/scala/translit/RussianSpec.scala b/shared/src/test/scala/translit/RussianSpec.scala
@@ -1,8 +1,8 @@
 package translit
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
-class RussianSpec extends FunSuite {
+class RussianSpec extends AnyFunSuite {
   val words = List(
     "Андрей" -> "Andrej",
     "Борис" -> "Boris",

diff --git a/shared/src/test/scala/translit/UkrainianSpec.scala b/shared/src/test/scala/translit/UkrainianSpec.scala
@@ -1,8 +1,8 @@
 package translit
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
-class UkrainianSpec extends FunSuite {
+class UkrainianSpec extends AnyFunSuite {
   val words = List(
     "Алушта" -> "Alushta",
     "Андрій" -> "Andrij",