Update to Scala 2.12.0

gnieh · Nov 6, 2016 · 0b00556 · 0b00556
1 parent 843d05e
commit 0b00556
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 9 deletions.
diff --git a/README.markdown b/README.markdown
@@ -3,6 +3,8 @@ Gnieh Tekstlib [![Build Status](https://travis-ci.org/gnieh/tekstlib.png)](https
 
 Gnieh Tekstlib is a library grouping standard classes and packages allowing people to work with texts and documents.
 
+Version 0.1.0-SNAPSHOT is published to Sonatype snapshots maven repository and is built for Scala 2.11 and 2.12.
+
 Package Structure
 -----------------
 

diff --git a/build.sbt b/build.sbt
@@ -4,11 +4,11 @@ name := "tekstlib"
 
 version := "0.1.0-SNAPSHOT"
 
-scalaVersion := "2.11.8"
+scalaVersion := "2.12.0"
 
-crossScalaVersions := Seq("2.11.8")
+crossScalaVersions := Seq("2.12.0", "2.11.8")
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "2.2.1" % "test"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.0" % "test"
 
 scalacOptions in (Compile, doc) ++= Seq("-doc-root-content", "rootdoc.txt")
 

diff --git a/project/build.properties b/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.13
diff --git a/src/test/scala/gnieh/diff/TestLcs.scala b/src/test/scala/gnieh/diff/TestLcs.scala
@@ -3,7 +3,7 @@ package test
 
 import org.scalatest._
 
-abstract class TestLcs extends FlatSpec with ShouldMatchers {
+abstract class TestLcs extends FlatSpec with Matchers {
 
   val lcsImpl: Lcs[Char]
 

diff --git a/src/test/scala/gnieh/pp/tests/PpTest.scala b/src/test/scala/gnieh/pp/tests/PpTest.scala
@@ -3,7 +3,7 @@ package tests
 
 import org.scalatest._
 
-abstract class PpTest extends FlatSpec with ShouldMatchers {
+abstract class PpTest extends FlatSpec with Matchers {
 
   val compact = CompactRenderer.andThen(_.layout)
 

diff --git a/src/test/scala/gnieh/regex/GreedinessTest.scala b/src/test/scala/gnieh/regex/GreedinessTest.scala
@@ -23,7 +23,7 @@ import org.scalatest._
  *
  *  @author Lucas Satabin
  */
-class GreedinessTest extends FlatSpec with ShouldMatchers {
+class GreedinessTest extends FlatSpec with Matchers {
 
   "Greedy operator" should "match as many characters as possible for star" in {
 

diff --git a/src/test/scala/gnieh/regex/MatchingTest.scala b/src/test/scala/gnieh/regex/MatchingTest.scala
@@ -24,7 +24,7 @@ import org.scalatest._
  *
  *  @author Lucas Satabin
  */
-class MatchingTest extends FlatSpec with ShouldMatchers {
+class MatchingTest extends FlatSpec with Matchers {
 
   "A single character regular expression" should "match iff the string is this character" in {
 

diff --git a/src/test/scala/gnieh/string/GapBufferTest.scala b/src/test/scala/gnieh/string/GapBufferTest.scala
@@ -15,7 +15,7 @@ package gnieh.string
 
 import org.scalatest._
 
-class GapBufferTest extends FlatSpec with ShouldMatchers {
+class GapBufferTest extends FlatSpec with Matchers {
 
   "The initial content size" should "be empty" in {
     val gb = new GapBuffer(1024)

diff --git a/src/test/scala/gnieh/string/SuffixArrayTest.scala b/src/test/scala/gnieh/string/SuffixArrayTest.scala
@@ -15,7 +15,7 @@ package gnieh.string
 
 import org.scalatest._
 
-class SuffixArrayTest extends FlatSpec with ShouldMatchers {
+class SuffixArrayTest extends FlatSpec with Matchers {
 
   "The suffix array of a string consisting of one single letter" should "be the reversed array of indices" in {
     val sa = SuffixArray.suffixArray("ööööööööööööööööööö")
-Original file line number
+Diff line change
@@ Expand Up @@
     Gnieh Tekstlib is a library grouping standard classes and packages allowing people to work with texts and documents.
+    Version 0.1.0-SNAPSHOT is published to Sonatype snapshots maven repository and is built for Scala 2.11 and 2.12.
     Package Structure
     -----------------
@@ Expand Down @@