Skip to content

Commit 3d173af

Browse files
bvennersbvenners
committed
Merge branch 'feature-3.1.2' into 3.1.x
2 parents 45e1058 + d034111 commit 3d173af

33 files changed

+122
-205
lines changed

‎README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ Before publishing any patch release, binary compatibility with previous version
145145
$ sbt ++2.10.7 scalacticJS/package scalacticJS/mimaReportBinaryIssues
146146
$ sbt ++2.10.7 scalatestJS/package scalatestJS/mimaReportBinaryIssues
147147

148-
$ sbt ++2.12.10 scalactic/package scalactic/mimaReportBinaryIssues
149-
$ sbt ++2.12.10 scalatest/package scalatest/mimaReportBinaryIssues
150-
$ sbt ++2.12.10 scalacticJS/package scalacticJS/mimaReportBinaryIssues
151-
$ sbt ++2.12.10 scalatestJS/package scalatestJS/mimaReportBinaryIssues
152-
153-
$ sbt ++2.13.1 scalactic/package scalactic/mimaReportBinaryIssues
154-
$ sbt ++2.13.1 scalatest/package scalatest/mimaReportBinaryIssues
155-
$ sbt ++2.13.1 scalacticJS/package scalacticJS/mimaReportBinaryIssues
156-
$ sbt ++2.13.1 scalatestJS/package scalatestJS/mimaReportBinaryIssues
148+
$ sbt ++2.12.11 scalactic/package scalactic/mimaReportBinaryIssues
149+
$ sbt ++2.12.11 scalatest/package scalatest/mimaReportBinaryIssues
150+
$ sbt ++2.12.11 scalacticJS/package scalacticJS/mimaReportBinaryIssues
151+
$ sbt ++2.12.11 scalatestJS/package scalatestJS/mimaReportBinaryIssues
152+
153+
$ sbt ++2.13.2 scalactic/package scalactic/mimaReportBinaryIssues
154+
$ sbt ++2.13.2 scalatest/package scalatest/mimaReportBinaryIssues
155+
$ sbt ++2.13.2 scalacticJS/package scalacticJS/mimaReportBinaryIssues
156+
$ sbt ++2.13.2 scalatestJS/package scalatestJS/mimaReportBinaryIssues
157157

158158
To publish scalactic, scalatest and scalatest-app use the following command:
159159

‎common-test.dotty/src/main/scala/org/scalatest/LineNumberHelper.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ private[scalatest] trait LineNumberHelper {
99

1010
object LineNumberMacro {
1111
def thisLineNumberImpl(implicit qctx: QuoteContext): Expr[Int] = {
12-
import qctx.tasty.{_, given}
12+
import qctx.tasty._
1313
Expr(rootPosition.startLine)
1414
}
1515
}

‎common-test/src/main/scala/org/scalatest/prop/Randomizer.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2244,7 +2244,7 @@ object Randomizer {
22442244
*/
22452245
def apply(seed: Long): Randomizer =
22462246
new Randomizer(seed) {
2247-
override private[scalatest] lazy val scrambledSeed: Long = (seed ^ 0x5DEECE66DL) & ((1L << 48) - 1)
2247+
override private[scalatest] lazy val scrambledSeed: Long = (this.seed ^ 0x5DEECE66DL) & ((1L << 48) - 1)
22482248
}
22492249

22502250
/**

‎project/BuildCommons.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import scala.io.Source
55

66
trait BuildCommons {
77

8-
lazy val supportedScalaVersions = List("2.13.1", "2.12.10", "2.11.12", "2.10.7")
8+
lazy val supportedScalaVersions = List("2.13.2", "2.12.11", "2.11.12", "2.10.7")
99

10-
val releaseVersion = "3.1.1"
10+
val releaseVersion = "3.1.2"
1111

12-
val previousReleaseVersion = "3.1.0"
12+
val previousReleaseVersion = "3.1.1"
1313

1414
def rootProject: Project
1515

‎project/DottyBuild.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ trait DottyBuild { this: BuildCommons =>
1313

1414
// List of available night build at https://repo1.maven.org/maven2/ch/epfl/lamp/dotty-compiler_0.14/
1515
// lazy val dottyVersion = dottyLatestNightlyBuild.get
16-
lazy val dottyVersion = "0.22.0-RC1"
16+
lazy val dottyVersion = "0.23.0"
1717
lazy val dottySettings = List(
1818
scalaVersion := dottyVersion,
1919
libraryDependencies := libraryDependencies.value.map(_.withDottyCompat(scalaVersion.value)),

‎project/GenAnyVals.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object GenAnyVals {
3232
| def apply(value: Expr[$primitiveTypeName])(implicit qctx: QuoteContext): Expr[$typeName] = {
3333
| val notValidMsg = Resources.notValid$typeName
3434
| val notLiteralMsg = Resources.notLiteral$typeName
35-
| import qctx.tasty.{_, given}
35+
| import qctx.tasty._
3636
| ensureValid${primitiveTypeName}Literal(value, notValidMsg, notLiteralMsg)(isValid)
3737
| '{ $typeName.ensuringValid($$value) }
3838
| }

‎project/JsBuild.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
1414

1515
trait JsBuild { this: BuildCommons =>
1616

17-
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")
17+
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.1")
1818
val sjsPrefix = if (scalaJSVersion.startsWith("1.")) "_sjs1_" else "_sjs0.6_"
1919

2020
lazy val deleteJsDependenciesTask = taskKey[Unit]("Delete JS_DEPENDENCIES")

‎project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
44

55
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4")
66

7-
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")
7+
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.1")
88

99
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1010

‎project/scalatest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
3636
val plusTestNGVersion = "1.0.0-SNAP8"
3737
val flexmarkVersion = "0.35.10"
3838

39-
val githubTag = "release-3.1.0" // for scaladoc source urls
39+
val githubTag = "release-3.1.2" // for scaladoc source urls
4040

4141
val scalatestDocSourceUrl =
4242
"https://github.com/scalatest/scalatest/tree/"+ githubTag +

‎publish.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ sbt "project scalactic" clean +publishSigned
33
export SCALAJS_VERSION=0.6.32
44
sbt "project scalacticMacroJS" clean
55
sbt "project scalacticJS" clean +publishSigned
6-
export SCALAJS_VERSION=1.0.0
6+
export SCALAJS_VERSION=1.0.1
77
sbt "project scalacticMacroJS" clean
88
sbt ++2.11.12 "project scalacticJS" clean publishSigned
9-
sbt ++2.12.10 "project scalacticJS" clean publishSigned
10-
sbt ++2.13.1 "project scalacticJS" clean publishSigned
9+
sbt ++2.12.11 "project scalacticJS" clean publishSigned
10+
sbt ++2.13.2 "project scalacticJS" clean publishSigned
1111
sbt ++2.11.12 "project scalacticNative" clean publishSigned
1212
sbt "project scalacticDotty" clean publishSigned
1313
sbt "project scalactic" sonatypeBundleUpload
@@ -17,20 +17,20 @@ sbt scalatestCompatible/clean scalatestCompatible/publishSigned
1717
sbt "project scalatest" clean +publishSigned
1818
export SCALAJS_VERSION=0.6.32
1919
sbt "project scalatestJS" clean +publishSigned
20-
export SCALAJS_VERSION=1.0.0
20+
export SCALAJS_VERSION=1.0.1
2121
sbt ++2.11.12 "project scalatestJS" clean publishSigned
22-
sbt ++2.12.10 "project scalatestJS" clean publishSigned
23-
sbt ++2.13.1 "project scalatestJS" clean publishSigned
22+
sbt ++2.12.11 "project scalatestJS" clean publishSigned
23+
sbt ++2.13.2 "project scalatestJS" clean publishSigned
2424
sbt ++2.11.12 "project scalatestNative" clean publishSigned
2525
sbt "project scalatestDotty" clean publishSigned
2626

2727
sbt clean
2828
sbt "project scalatestApp" clean +publishSigned
2929
export SCALAJS_VERSION=0.6.32
3030
sbt "project scalatestAppJS" clean +publishSigned
31-
export SCALAJS_VERSION=1.0.0
31+
export SCALAJS_VERSION=1.0.1
3232
sbt ++2.11.12 "project scalatestAppJS" clean publishSigned
33-
sbt ++2.12.10 "project scalatestAppJS" clean publishSigned
34-
sbt ++2.13.1 "project scalatestAppJS" clean publishSigned
33+
sbt ++2.12.11 "project scalatestAppJS" clean publishSigned
34+
sbt ++2.13.2 "project scalatestAppJS" clean publishSigned
3535
sbt ++2.11.12 "project scalatestAppNative" clean publishSigned
3636
sbt "project scalatest" sonatypeBundleUpload

0 commit comments

Comments
 (0)