Skip to content

Commit 1b87923

Browse files
bvennersbvenners
committed
Merge branch 'cheeseng-travis-3.1-3.2' into 3.1.x
2 parents 5db20ca + d5b9b84 commit 1b87923

File tree

16 files changed

+676
-605
lines changed

16 files changed

+676
-605
lines changed

‎.jvmopts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-server
22
-Xms512M
33
-Xmx4000M
4-
-Xss1M
4+
-Xss10M
55
-XX:+CMSClassUnloadingEnabled
66
-XX:+UseConcMarkSweepGC
77
-XX:+CMSIncrementalMode

‎.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: scala
22
scala:
3-
- 2.10.6
4-
- 2.11.11
3+
- 2.10.7
4+
- 2.11.12
55
- 2.12.4
66
- 2.13.0-M2
77
addons:
@@ -16,6 +16,8 @@ jdk:
1616
dist: trusty
1717
sudo: false
1818

19+
sbt_args: -J-Xss10m
20+
1921
env:
2022
#see https://github.com/scalatest/scalatest/pull/245
2123
#global values should be replaced using http://docs.travis-ci.com/user/encryption-keys/ with valid values
@@ -56,14 +58,16 @@ matrix:
5658
jdk: openjdk6
5759
- scala: "2.12.4"
5860
jdk: openjdk6
59-
- scala: "2.11.11"
61+
- scala: "2.11.12"
6062
jdk: oraclejdk8
61-
- scala: "2.10.6"
63+
- scala: "2.10.7"
6264
jdk: oraclejdk8
6365

6466
branches:
6567
only:
6668
- 3.0.x
69+
- 3.1.x
70+
- 3.2.x
6771

6872
#before_script: ./travis_build.sh Compile
6973
script: ./travis_build.sh $MODE

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ With Sonatype credentials and GPG file in place, you can now publish to Sonatype
119119

120120
To publish scalactic, scalatest and scalatest-app (for Scala and Scala-js, version 2.11 and 2.10, and make sure you're on Java 6) to Sonatype, use the following command:
121121

122-
`$ sbt clean publishSigned ++2.11.11 "project scalatestAppJS" clean publishSigned ++2.10.6 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned`
122+
`$ sbt clean publishSigned ++2.11.12 "project scalatestAppJS" clean publishSigned ++2.10.7 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned`
123123

124124
To publish scalactic, scalatest and scalatest-app (for Scala and Scala-js, version 2.12 and 2.13, and make sure you're on Java 8) to Sonatype, use the following command:
125125

‎project/scalatest.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ object ScalatestBuild extends Build {
219219
"commons-io" % "commons-io" % "1.3.2" % "test",
220220
"org.eclipse.jetty" % "jetty-server" % "8.1.18.v20150929" % "test",
221221
"org.eclipse.jetty" % "jetty-webapp" % "8.1.18.v20150929" % "test",
222-
"io.circe" %% "circe-parser" % "0.7.1" % "test"
222+
"io.spray" %% "spray-json" % "1.3.4" % "test"
223223
)
224224

225225
def scalatestJSLibraryDependencies =
@@ -431,6 +431,7 @@ object ScalatestBuild extends Build {
431431
"-W", "120", "60")),
432432
logBuffered in Test := false,
433433
libraryDependencies += scalacheckDependency("test"),
434+
libraryDependencies ++= crossBuildTestLibraryDependencies(scalaVersion.value),
434435
publishArtifact := false,
435436
publish := {},
436437
publishLocal := {},
@@ -552,6 +553,7 @@ object ScalatestBuild extends Build {
552553
libraryDependencies ++= crossBuildLibraryDependencies(scalaVersion.value),
553554
libraryDependencies ++= scalatestLibraryDependencies,
554555
libraryDependencies ++= scalatestTestLibraryDependencies(scalaVersion.value),
556+
libraryDependencies ++= crossBuildTestLibraryDependencies(scalaVersion.value),
555557
testOptions in Test := scalatestTestOptions,
556558
logBuffered in Test := false,
557559
//fork in Test := true,
@@ -651,7 +653,7 @@ object ScalatestBuild extends Build {
651653
organization := "org.scalatest",
652654
libraryDependencies ++= crossBuildLibraryDependencies(scalaVersion.value),
653655
libraryDependencies += "org.scalacheck" %%% "scalacheck" % scalacheckVersion % "test",
654-
libraryDependencies += "io.circe" %%% "circe-parser" % "0.7.1" % "test",
656+
libraryDependencies += "io.spray" %% "spray-json" % "1.3.4" % "optional",
655657
//jsDependencies += RuntimeDOM % "test",
656658
scalaJSOptimizerOptions ~= { _.withDisableOptimizer(true) },
657659
//jsEnv := NodeJSEnv(executable = "node").value,
@@ -817,7 +819,8 @@ object ScalatestBuild extends Build {
817819
"org.testng" % "testng" % testngVersion % "optional",
818820
"org.jmock" % "jmock-legacy" % jmockVersion % "optional",
819821
"org.pegdown" % "pegdown" % pegdownVersion % "optional",
820-
"io.circe" %% "circe-parser" % "0.7.1" % "test"
822+
"io.spray" %% "spray-json" % "1.3.4" % "optional"
823+
821824
)
822825

823826
def gentestsSharedSettings: Seq[Setting[_]] = Seq(

‎scalactic-macro/src/main/scala/org/scalactic/anyvals/NumericString.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import scala.collection.GenIterable
2626
import scala.collection.GenTraversableOnce
2727
import scala.collection.generic.CanBuildFrom
2828
import scala.collection.generic.FilterMonadic
29-
import scala.collection.parallel.ParSeq
29+
//import scala.collection.parallel.ParSeq
3030
import scala.util.matching.Regex
3131
import scala.language.higherKinds
3232
import scala.util.{Try, Success, Failure}
@@ -1673,8 +1673,8 @@ final class NumericString private (val value: String) extends AnyVal {
16731673
*
16741674
* @return a parallel implementation of this collection
16751675
*/
1676-
def par: ParSeq[Char] =
1677-
value.par
1676+
/*def par: ParSeq[Char] =
1677+
value.par*/
16781678
// SKIP-SCALATESTJS-END
16791679

16801680
/** Partitions this `NumericString` in two strings according to a predicate.

‎scalactic-test/src/test/scala/org/scalactic/DirectRequirementsSpec.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ class DirectRequirementsSpec extends FunSpec with OptionValues {
525525
val e = intercept[IllegalArgumentException] {
526526
org.scalactic.Requirements.require(a == 3 && { println("hi"); b == 3})
527527
}
528-
if (ScalacticVersions.BuiltForScalaVersion == "2.12")
528+
if (ScalacticVersions.BuiltForScalaVersion == "2.12" || ScalacticVersions.BuiltForScalaVersion == "2.13")
529529
assert(e.getMessage == commaBut(equaled(3, 3), wasFalse("{" + lineSeparator + " scala.Predef.println(\"hi\");" + lineSeparator + " b.==(3)" + lineSeparator + "}")))
530530
else
531531
assert(e.getMessage == commaBut(equaled(3, 3), wasFalse("{" + lineSeparator + " scala.this.Predef.println(\"hi\");" + lineSeparator + " b.==(3)" + lineSeparator + "}")))
@@ -539,7 +539,7 @@ class DirectRequirementsSpec extends FunSpec with OptionValues {
539539
val e = intercept[IllegalArgumentException] {
540540
org.scalactic.Requirements.require({ println("hi"); b == 5} && a == 5)
541541
}
542-
if (ScalacticVersions.BuiltForScalaVersion == "2.12")
542+
if (ScalacticVersions.BuiltForScalaVersion == "2.12" || ScalacticVersions.BuiltForScalaVersion == "2.13")
543543
assert(e.getMessage == commaBut(wasTrue("{" + lineSeparator + " scala.Predef.println(\"hi\");" + lineSeparator + " b.==(5)" + lineSeparator + "}"), didNotEqual(3, 5)))
544544
else
545545
assert(e.getMessage == commaBut(wasTrue("{" + lineSeparator + " scala.this.Predef.println(\"hi\");" + lineSeparator + " b.==(5)" + lineSeparator + "}"), didNotEqual(3, 5)))
@@ -1671,7 +1671,7 @@ class DirectRequirementsSpec extends FunSpec with OptionValues {
16711671
val e = intercept[IllegalArgumentException] {
16721672
org.scalactic.Requirements.require(a == 3 && { println("hi"); b == 3}, ", dude")
16731673
}
1674-
if (ScalacticVersions.BuiltForScalaVersion == "2.12")
1674+
if (ScalacticVersions.BuiltForScalaVersion == "2.12" || ScalacticVersions.BuiltForScalaVersion == "2.13")
16751675
assert(e.getMessage == commaBut(equaled(3, 3), wasFalse("{" + lineSeparator + " scala.Predef.println(\"hi\");" + lineSeparator + " b.==(3)" + lineSeparator + "}")) + ", dude")
16761676
else
16771677
assert(e.getMessage == commaBut(equaled(3, 3), wasFalse("{" + lineSeparator + " scala.this.Predef.println(\"hi\");" + lineSeparator + " b.==(3)" + lineSeparator + "}")) + ", dude")
@@ -1685,7 +1685,7 @@ class DirectRequirementsSpec extends FunSpec with OptionValues {
16851685
val e = intercept[IllegalArgumentException] {
16861686
org.scalactic.Requirements.require({ println("hi"); b == 5} && a == 5, ", dude")
16871687
}
1688-
if (ScalacticVersions.BuiltForScalaVersion == "2.12")
1688+
if (ScalacticVersions.BuiltForScalaVersion == "2.12" || ScalacticVersions.BuiltForScalaVersion == "2.13")
16891689
assert(e.getMessage == commaBut(wasTrue("{" + lineSeparator + " scala.Predef.println(\"hi\");" + lineSeparator + " b.==(5)" + lineSeparator + "}"), didNotEqual(3, 5)) + ", dude")
16901690
else
16911691
assert(e.getMessage == commaBut(wasTrue("{" + lineSeparator + " scala.this.Predef.println(\"hi\");" + lineSeparator + " b.==(5)" + lineSeparator + "}"), didNotEqual(3, 5)) + ", dude")
@@ -2777,7 +2777,7 @@ class DirectRequirementsSpec extends FunSpec with OptionValues {
27772777
val e = intercept[IllegalStateException] {
27782778
org.scalactic.Requirements.requireState(a == 3 && { println("hi"); b == 3})
27792779
}
2780-
if (ScalacticVersions.BuiltForScalaVersion == "2.12")
2780+
if (ScalacticVersions.BuiltForScalaVersion == "2.12" || ScalacticVersions.BuiltForScalaVersion == "2.13")
27812781
assert(e.getMessage == commaBut(equaled(3, 3), wasFalse("{" + lineSeparator + " scala.Predef.println(\"hi\");" + lineSeparator + " b.==(3)" + lineSeparator + "}")))
27822782
else
27832783
assert(e.getMessage == commaBut(equaled(3, 3), wasFalse("{" + lineSeparator + " scala.this.Predef.println(\"hi\");" + lineSeparator + " b.==(3)" + lineSeparator + "}")))
@@ -2791,7 +2791,7 @@ class DirectRequirementsSpec extends FunSpec with OptionValues {
27912791
val e = intercept[IllegalStateException] {
27922792
org.scalactic.Requirements.requireState({ println("hi"); b == 5} && a == 5)
27932793
}
2794-
if (ScalacticVersions.BuiltForScalaVersion == "2.12")
2794+
if (ScalacticVersions.BuiltForScalaVersion == "2.12" || ScalacticVersions.BuiltForScalaVersion == "2.13")
27952795
assert(e.getMessage == commaBut(wasTrue("{" + lineSeparator + " scala.Predef.println(\"hi\");" + lineSeparator + " b.==(5)" + lineSeparator + "}"), didNotEqual(3, 5)))
27962796
else
27972797
assert(e.getMessage == commaBut(wasTrue("{" + lineSeparator + " scala.this.Predef.println(\"hi\");" + lineSeparator + " b.==(5)" + lineSeparator + "}"), didNotEqual(3, 5)))
@@ -3923,7 +3923,7 @@ class DirectRequirementsSpec extends FunSpec with OptionValues {
39233923
val e = intercept[IllegalStateException] {
39243924
org.scalactic.Requirements.requireState(a == 3 && { println("hi"); b == 3}, ", dude")
39253925
}
3926-
if (ScalacticVersions.BuiltForScalaVersion == "2.12")
3926+
if (ScalacticVersions.BuiltForScalaVersion == "2.12" || ScalacticVersions.BuiltForScalaVersion == "2.13")
39273927
assert(e.getMessage == commaBut(equaled(3, 3), wasFalse("{" + lineSeparator + " scala.Predef.println(\"hi\");" + lineSeparator + " b.==(3)" + lineSeparator + "}")) + ", dude")
39283928
else
39293929
assert(e.getMessage == commaBut(equaled(3, 3), wasFalse("{" + lineSeparator + " scala.this.Predef.println(\"hi\");" + lineSeparator + " b.==(3)" + lineSeparator + "}")) + ", dude")
@@ -3937,7 +3937,7 @@ class DirectRequirementsSpec extends FunSpec with OptionValues {
39373937
val e = intercept[IllegalStateException] {
39383938
org.scalactic.Requirements.requireState({ println("hi"); b == 5} && a == 5, ", dude")
39393939
}
3940-
if (ScalacticVersions.BuiltForScalaVersion == "2.12")
3940+
if (ScalacticVersions.BuiltForScalaVersion == "2.12" || ScalacticVersions.BuiltForScalaVersion == "2.13")
39413941
assert(e.getMessage == commaBut(wasTrue("{" + lineSeparator + " scala.Predef.println(\"hi\");" + lineSeparator + " b.==(5)" + lineSeparator + "}"), didNotEqual(3, 5)) + ", dude")
39423942
else
39433943
assert(e.getMessage == commaBut(wasTrue("{" + lineSeparator + " scala.this.Predef.println(\"hi\");" + lineSeparator + " b.==(5)" + lineSeparator + "}"), didNotEqual(3, 5)) + ", dude")

‎scalactic-test/src/test/scala/org/scalactic/anyvals/NonEmptyArraySpec.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ import scala.collection.mutable.ArrayBuffer
2121

2222
import org.scalactic.{Every, One, Many, StringNormalizations}
2323
import org.scalactic.UnitSpec
24+
// SKIP-SCALATESTJS-START
25+
import org.scalatest.CompatParColls.Converters._
26+
// SKIP-SCALATESTJS-END
2427

2528
class NonEmptyArraySpec extends UnitSpec {
2629
"A NonEmptyArray" can "be constructed with one element" in {

‎scalactic-test/src/test/scala/org/scalactic/anyvals/NonEmptyListSpec.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ import scala.collection.mutable.ListBuffer
2121

2222
import org.scalactic.{Every, One, Many, StringNormalizations}
2323
import org.scalactic.UnitSpec
24+
// SKIP-SCALATESTJS-START
25+
import org.scalatest.CompatParColls.Converters._
26+
// SKIP-SCALATESTJS-END
2427

2528
class NonEmptyListSpec extends UnitSpec {
2629
"A NonEmptyList" can "be constructed with one element" in {

‎scalactic-test/src/test/scala/org/scalactic/anyvals/NonEmptyMapSpec.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ import scala.collection.mutable.ListBuffer
2222
import org.scalactic.{Every, One, Many, StringNormalizations}
2323
import org.scalactic.UnitSpec
2424

25+
// SKIP-SCALATESTJS-START
26+
import org.scalatest.CompatParColls.Converters._
27+
// SKIP-SCALATESTJS-END
28+
2529
class NonEmptyMapSpec extends UnitSpec {
2630
"A NonEmptyMap" can "be constructed with one element" in {
2731
val onesie = NonEmptyMap(3 -> "three")
@@ -695,6 +699,7 @@ class NonEmptyMapSpec extends UnitSpec {
695699
def toDouble(x: (Int, Int)): Double = x._1.toDouble
696700

697701
def compare(x: (Int, Int), y: (Int, Int)): Int = x._1 compare y._1
702+
def parseString(str: String): Option[(Int, Int)] = ??? // For scala 2.13, for testing purpose we do not need to implement it here.
698703
}
699704

700705
NonEmptyMap(1 -> 1).sum shouldBe 1 -> 1

‎scalactic-test/src/test/scala/org/scalactic/anyvals/NonEmptySetSpec.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ import scala.collection.mutable.ListBuffer
2222
import org.scalactic.{Every, One, Many, StringNormalizations}
2323
import org.scalactic.UnitSpec
2424

25+
// SKIP-SCALATESTJS-START
26+
import org.scalatest.CompatParColls.Converters._
27+
// SKIP-SCALATESTJS-END
28+
2529
class NonEmptySetSpec extends UnitSpec {
2630
"A NonEmptySet" can "be constructed with one element" in {
2731
val onesie = NonEmptySet(3)

‎scalactic-test/src/test/scala/org/scalactic/anyvals/NonEmptyStringSpec.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ import scala.collection.mutable.ListBuffer
2222
import org.scalactic.{Every, One, Many, StringNormalizations}
2323
import org.scalactic.UnitSpec
2424

25+
// SKIP-SCALATESTJS-START
26+
import org.scalatest.CompatParColls.Converters._
27+
// SKIP-SCALATESTJS-END
28+
2529
class NonEmptyStringSpec extends UnitSpec {
2630
"A NonEmptyString" can "be constructed with one character" in {
2731
val onesie = NonEmptyString("3")

‎scalactic-test/src/test/scala/org/scalactic/anyvals/NonEmptyVectorSpec.scala

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ import scala.collection.mutable.ListBuffer
2222
import org.scalactic.{Every, One, Many, StringNormalizations}
2323
import org.scalactic.UnitSpec
2424

25+
// SKIP-SCALATESTJS-START
26+
import org.scalatest.CompatParColls.Converters._
27+
// SKIP-SCALATESTJS-END
28+
2529
class NonEmptyVectorSpec extends UnitSpec {
2630
"A NonEmptyVector" can "be constructed with one element" in {
2731
val onesie = NonEmptyVector(3)

‎scalactic-test/src/test/scala/org/scalactic/anyvals/NumericStringSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,12 +1409,12 @@ class NumericStringSpec extends FunSpec with Matchers with GeneratorDrivenProper
14091409
}
14101410
}
14111411
// SKIP-SCALATESTJS-START
1412-
it("should offer a par method consistent with StringOps") {
1412+
/*it("should offer a par method consistent with StringOps") {
14131413
forAll { (numStr: NumericString) =>
14141414
numStr.par shouldEqual
14151415
numStr.value.par
14161416
}
1417-
}
1417+
}*/
14181418
// SKIP-SCALATESTJS-END
14191419
it("should offer a partition method consistent with StringOps") {
14201420
def isEven(ch: Char): Boolean = (ch - '0') % 2 == 0

0 commit comments

Comments
 (0)