diff --git a/RELEASING.md b/RELEASING.md index f92dd508..a6cdf9ff 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -41,7 +41,7 @@ See the [prerequisites](#prerequisites) if this is your first release. [repo1/list]: https://repo1.maven.org/maven2/com/typesafe/mima-core_2.12/0.5.0/ [sonatype/guide]: https://central.sonatype.org/pages/releasing-the-deployment.html [sonatype/staging-repos]: https://oss.sonatype.org/#stagingRepositories -[travis-ci]: https://travis-ci.org/lightbend/mima +[travis-ci]: https://travis-ci.com/github/lightbend/mima You are done! diff --git a/build.sbt b/build.sbt index 073172fd..eda032f1 100644 --- a/build.sbt +++ b/build.sbt @@ -25,13 +25,13 @@ commands += Command.command("testStaging") { state => prep ::: "mimaReportBinaryIssues" :: state } -val supportedScalaVersions = Seq("2.12.13", "2.13.5") +val scala213 = "2.13.5" val root = project.in(file(".")).settings( name := "mima", crossScalaVersions := Nil, mimaFailOnNoPrevious := false, - skip in publish := true, + publish / skip := true, ) aggregateProjects(core, sbtplugin, functionalTests) @@ -40,7 +40,7 @@ val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat val core = project.settings( name := "mima-core", - crossScalaVersions := supportedScalaVersions, + crossScalaVersions += scala213, libraryDependencies += scalaCollectionCompat, libraryDependencies += munit % Test, testFrameworks += new TestFramework("munit.Framework"), @@ -72,7 +72,7 @@ val functionalTests = Project("functional-tests", file("functional-tests")) .dependsOn(core) .configs(IntegrationTest) .settings( - crossScalaVersions := supportedScalaVersions, + crossScalaVersions += scala213, libraryDependencies += "com.typesafe" % "config" % "1.4.1", libraryDependencies += "io.get-coursier" %% "coursier" % "2.0.16", libraryDependencies += munit, @@ -86,5 +86,5 @@ val functionalTests = Project("functional-tests", file("functional-tests")) Test / mainClass := Some("com.typesafe.tools.mima.lib.UnitTests"), IntegrationTest / mainClass := Some("com.typesafe.tools.mima.lib.IntegrationTests"), mimaFailOnNoPrevious := false, - skip in publish := true, + publish / skip := true, ) diff --git a/functional-tests/src/main/scala/com/typesafe/tools/mima/lib/TestCli.scala b/functional-tests/src/main/scala/com/typesafe/tools/mima/lib/TestCli.scala index 41c2991f..c23495b2 100644 --- a/functional-tests/src/main/scala/com/typesafe/tools/mima/lib/TestCli.scala +++ b/functional-tests/src/main/scala/com/typesafe/tools/mima/lib/TestCli.scala @@ -9,9 +9,9 @@ import scala.util.{ Properties => StdLibProps } object TestCli { val scala211 = "2.11.12" - val scala212 = "2.12.12" - val scala213 = "2.13.4" - val scala3 = "3.0.0-M3" + val scala212 = "2.12.13" + val scala213 = "2.13.5" + val scala3 = "3.0.0-RC3" val hostScalaVersion = StdLibProps.scalaPropOrNone("maven.version.number").get val allScalaVersions = List(scala211, scala212, scala213, scala3) val testsDir = Directory("functional-tests/src/test")