Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support Scala 2.12.0 #48

Closed
wants to merge 1 commit into from
Closed

support Scala 2.12.0 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ version:="0.8.3"

scalaVersion:="2.10.4"

crossScalaVersions := Seq("2.10.4", "2.11.4")
crossScalaVersions := Seq("2.10.4", "2.11.4", "2.12.0")

organization := "com.tristanhunt"

libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "2.2.2" % "test",
"org.scalatest" %% "scalatest" % "3.0.0" % "test",
"junit" % "junit" % "4.11" % "test",
"net.sf.jtidy" % "jtidy" % "r938" % "test"
)
Expand All @@ -18,16 +18,14 @@ libraryDependencies := {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
libraryDependencies.value ++ Seq(
"org.scala-lang.modules" %% "scala-xml" % "1.0.1",
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.1"
"org.scala-lang.modules" %% "scala-xml" % "1.0.5",
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4"
)
case _ =>
libraryDependencies.value
}
}

useGpg := true

publishMavenStyle := true

publishTo := {
Expand Down Expand Up @@ -61,4 +59,4 @@ pomExtra := (
<name>Tristan Juricek</name>
<url>http://tristanjuricek.com</url>
</developer>
</developers>)
</developers>)
3 changes: 1 addition & 2 deletions src/test/scala/com/tristanhunt/knockoff/ChunkParsersSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ package com.tristanhunt.knockoff
//import org.junit.runner.RunWith
import org.scalatest.junit._
import org.junit.runner._
import org.scalatest.matchers._
import org.scalatest._

@RunWith(classOf[JUnitRunner])
class ChunkParsersSpec extends ChunkParser with FunSpecLike with ShouldMatchers {
class ChunkParsersSpec extends ChunkParser with FunSpecLike with Matchers {

describe("ChunkParser") {
it("should handle simple bullet items") {
Expand Down
3 changes: 1 addition & 2 deletions src/test/scala/com/tristanhunt/knockoff/KnockoffIntegrationTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ package com.tristanhunt.knockoff
import java.io._
import org.junit.runner.RunWith

import org.scalatest.matchers._
import org.scalatest._
import org.scalatest.junit.JUnitRunner
import org.w3c.tidy.Tidy
import scala.collection.mutable.ListBuffer
import scala.xml.{ Node, XML }

@RunWith(classOf[JUnitRunner])
class KnockoffIntegrationTests extends FunSpecLike with ShouldMatchers {
class KnockoffIntegrationTests extends FunSpecLike with Matchers {


val basedir = "src/test/resources/tests"
Expand Down
3 changes: 1 addition & 2 deletions src/test/scala/com/tristanhunt/knockoff/SpanConverterSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ package com.tristanhunt.knockoff
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest._
import org.scalatest.matchers._
import scala.util.parsing.input.NoPosition

@RunWith(classOf[JUnitRunner])
class SpanConverterSpec extends FunSpecLike with ShouldMatchers {
class SpanConverterSpec extends FunSpecLike with Matchers {

def convert( txt : String ) : List[Span] = convert( txt, Nil )

Expand Down
3 changes: 1 addition & 2 deletions src/test/scala/com/tristanhunt/knockoff/StringExtrasSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ package com.tristanhunt.knockoff
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest._
import org.scalatest.matchers._

@RunWith(classOf[JUnitRunner])
class StringExtrasSpec extends FunSpecLike with ShouldMatchers with StringExtras {
class StringExtrasSpec extends FunSpecLike with Matchers with StringExtras {

describe("StringExtras") {
it( "should find two different groups of the same time" ) {
Expand Down