Skip to content

Commit dd37481

Browse files
committed
bump Scala 3 to 3.0.0-RC2; add version policy. fixes #150
1 parent 5f7373f commit dd37481

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

Diff for: .travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ scala:
88
- 2.11.12
99
- 2.12.11
1010
- 2.13.3
11-
- 3.0.0-RC1
11+
- 3.0.0-RC2
1212

1313
env:
1414
- ADOPTOPENJDK=8

Diff for: build.sbt

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
lazy val scalaTestVersion = "3.2.4"
1+
lazy val scalaTestVersion = "3.2.7"
2+
3+
// We use <epoch>.<major>.<minor> like 99% of Scala libraries.
4+
// Versions are binary compatible within x.y.* but not within x.*.*
5+
ThisBuild / versionScheme := Some("pvp")
6+
ThisBuild / versionPolicyIntention := Compatibility.None // 3.0.0
27

38
lazy val commonSettings = Seq(
49
scalacOptions ++= Seq("-deprecation", "-feature"),

Diff for: build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ export CI_SNAPSHOT_RELEASE="${projectPrefix}publish"
5151
# for now, until we're confident in the new release scripts, just close the staging repo.
5252
export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
5353

54-
sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $releaseTask
54+
sbt clean ${projectPrefix}test ${projectPrefix}versionPolicyCheck ${projectPrefix}publishLocal $releaseTask

Diff for: project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.7
1+
sbt.version=1.4.9

Diff for: project/plugins.sbt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
2-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3") // cross-compile for dotty
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.4")
2+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4") // cross-compile for dotty
3+
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")

0 commit comments

Comments
 (0)