Skip to content

bump some versions (Scala, MiMa) #275

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

Merged
merged 4 commits into from
Dec 13, 2019
Merged

bump some versions (Scala, MiMa) #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
781866b
bump Scala versions everywhere (2.12.0, 2.13.1)
SethTisue Dec 13, 2019
17f84c5
fix expected/actual order in a test
SethTisue Dec 10, 2019
6f37a1a
Add detail to "BinaryCompaTest"
dwijnand Dec 11, 2019
7b3b80e
use latest MiMa
SethTisue Dec 10, 2019
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
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ language: scala

scala:
- 2.11.12
- 2.12.8
- 2.13.0
- 2.12.10
- 2.13.1

env:
- SCALAJS_VERSION= ADOPTOPENJDK=8
Expand All @@ -22,15 +22,15 @@ matrix:
include:

# run migration test
- scala: 2.12.8
- scala: 2.12.10
env: TEST_SCALAFIX=true ADOPTOPENJDK=8

# run binary compatibility test
- scala: 2.12.8
- scala: 2.12.10
env: TEST_BINARY_COMPAT=true ADOPTOPENJDK=8

# run scalafmt
- scala: 2.12.8
- scala: 2.12.10
env: TEST_SCALAFMT=true ADOPTOPENJDK=8

# Scala Native includes
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The library also adds backported versions of new collection types, currently `sc

## Migration Tool

The migration rules use scalafix. Please see the [official installation instruction](https://scalacenter.github.io/scalafix/docs/users/installation.html) and, in particular, check that your full Scala version is supported (ex 2.12.8).
The migration rules use scalafix. Please see the [official installation instruction](https://scalacenter.github.io/scalafix/docs/users/installation.html) and, in particular, check that your full Scala version is supported (ex 2.12.10).

```scala
// project/plugins.sbt
Expand Down
12 changes: 11 additions & 1 deletion binary-compat/test/src/test/scala/BinaryCompaTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ class BinaryCompaTest {
Config.setup("foo", Array(oldClasspath, newClasspath))
val mima = new MiMaLib(Config.baseClassPath)
val allProblems = mima.collectProblems(oldClasspath, newClasspath)
Assert.assertEquals(allProblems, Nil)
val unexpectedDescriptions =
allProblems.iterator
.map(_.description("new"))
.map{x => println(x); x}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably should drop this.

.filterNot(_ == "static method id(scala.collection.Iterable,scala.collection.generic.CanBuildFrom)scala.collection.Iterable in class org.example.Lib has a different signature in new version, where it is <A:Ljava/lang/Object;C::Lscala/collection/Iterable<Ljava/lang/Object;>;>(TC;Lscala/collection/generic/CanBuildFrom<Lscala/runtime/Nothing$;TA;TC;>;)TC; rather than <A:Ljava/lang/Object;C::Lscala/collection/Iterable<Ljava/lang/Object;>;>(TC;Lscala/collection/generic/CanBuildFrom<TC;TA;TC;>;)TC;")
.filterNot(_ == "method id(scala.collection.Iterable,scala.collection.generic.CanBuildFrom)scala.collection.Iterable in object org.example.Lib has a different signature in new version, where it is <A:Ljava/lang/Object;C::Lscala/collection/Iterable<Ljava/lang/Object;>;>(TC;Lscala/collection/generic/CanBuildFrom<Lscala/runtime/Nothing$;TA;TC;>;)TC; rather than <A:Ljava/lang/Object;C::Lscala/collection/Iterable<Ljava/lang/Object;>;>(TC;Lscala/collection/generic/CanBuildFrom<TC;TA;TC;>;)TC;")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The, uhm, "standard" way to do this would be a ProblemFilter, which is Problem => Boolean and constructed with: https://github.com/lightbend/mima/blob/1788742d28e7ec073152fd900bd89ec618168b16/core/src/main/scala/com/typesafe/tools/mima/core/ProblemFilters.scala#L22

.toList
val msg =
unexpectedDescriptions.mkString(
s"The following ${allProblems.size} problems were reported but not expected:\n - ", "\n - ", "\n")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unexpectedDescriptions.size

Assert.assertEquals(msg, Nil, unexpectedDescriptions)
}
}
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ lazy val root = project
lazy val junit = libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test

lazy val scala211 = "2.11.12"
lazy val scala212 = "2.12.8"
lazy val scala213 = "2.13.0"
lazy val scala212 = "2.12.10"
lazy val scala213 = "2.13.1"

/** Create an OSGi version range for standard Scala versioning
* schemes that describes binary compatible versions. */
Expand Down Expand Up @@ -139,7 +139,7 @@ lazy val `binary-compat` = project
.settings(commonSettings)
.settings(
scalaVersion := scala212,
libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.3.0" % Test,
libraryDependencies += "com.typesafe" %% "mima-core" % "0.6.1" % Test,
junit,
buildInfoPackage := "build",
buildInfoKeys := Seq[BuildInfoKey](
Expand Down
2 changes: 1 addition & 1 deletion project/MultiScalaProject.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import java.io.File
*
* // instanciate a sbt project
* lazy val myProject211 = myProject("2.11.12", _.settings(...) /* scala version dependent configurations */)
* lazy val myProject212 = myProject("2.12.8" , _.settings(...))
* lazy val myProject212 = myProject("2.12.10" , _.settings(...))
* // ...
* }}}
*/
Expand Down