Skip to content

Commit 1857542

Browse files
authored
Merge pull request #386 from regadas/update/scala-version
Update scala to 2.12.10
2 parents 5ef6eef + 26429f6 commit 1857542

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
language: scala
22
jdk: openjdk8
33
scala:
4-
- 2.12.9
4+
- 2.12.10
55
- 2.13.0
66

77
script: sbt "++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues" "++$TRAVIS_SCALA_VERSION test" "++$TRAVIS_SCALA_VERSION IntegrationTest/test"
88

99
jobs:
1010
include:
11-
- { name: 2.12 testFunctional 2.11, script: sbt -Dmima.buildScalaVersion=2.12.9 -Dmima.testScalaVersion=2.11.12 testFunctional }
12-
- { name: 2.12 testFunctional 2.12, script: sbt -Dmima.buildScalaVersion=2.12.9 -Dmima.testScalaVersion=2.12.9 testFunctional }
13-
- { name: 2.12 testFunctional 2.13, script: sbt -Dmima.buildScalaVersion=2.12.9 -Dmima.testScalaVersion=2.13.0 testFunctional }
11+
- { name: 2.12 testFunctional 2.11, script: sbt -Dmima.buildScalaVersion=2.12.10 -Dmima.testScalaVersion=2.11.12 testFunctional }
12+
- { name: 2.12 testFunctional 2.12, script: sbt -Dmima.buildScalaVersion=2.12.10 -Dmima.testScalaVersion=2.12.10 testFunctional }
13+
- { name: 2.12 testFunctional 2.13, script: sbt -Dmima.buildScalaVersion=2.12.10 -Dmima.testScalaVersion=2.13.0 testFunctional }
1414
- { name: 2.13 testFunctional 2.11, script: sbt -Dmima.buildScalaVersion=2.13.0 -Dmima.testScalaVersion=2.11.12 testFunctional }
15-
- { name: 2.13 testFunctional 2.12, script: sbt -Dmima.buildScalaVersion=2.13.0 -Dmima.testScalaVersion=2.12.9 testFunctional }
15+
- { name: 2.13 testFunctional 2.12, script: sbt -Dmima.buildScalaVersion=2.13.0 -Dmima.testScalaVersion=2.12.10 testFunctional }
1616
- { name: 2.13 testFunctional 2.13, script: sbt -Dmima.buildScalaVersion=2.13.0 -Dmima.testScalaVersion=2.13.0 testFunctional }
1717
- { name: scripted 1/2, script: sbt "scripted sbt-mima-plugin/*1of2" }
1818
- { name: scripted 2/2, script: sbt "scripted sbt-mima-plugin/*2of2" }

project/MimaSettings.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ object MimaSettings {
3838
// * com.typesafe.tools.mima.core.Config.setup
3939
// * com.typesafe.tools.mima.core.reporterClassPath
4040
// * com.typesafe.tools.mima.lib.MiMaLib.collectProblems
41+
42+
// scala/scala@f6bfdf0 changed visibleSettings from a Set to a List
43+
exclude[DirectMissingMethodProblem]("*.mima.core.Settings.visibleSettings"),
4144
),
4245
)
4346
}

0 commit comments

Comments
 (0)