Skip to content

Commit 9451d2f

Browse files
committed
build mima master branch now that 2.12 support was merged
note that this requires being on sbt 0.13.16
1 parent 81228f6 commit 9451d2f

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

configs/community.dbuild

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -538,15 +538,9 @@ build += {
538538
extra.options: ["-DSKIP_FLAKY=true"]
539539
}
540540

541-
// note that we don't have MiMa in the JDK6 build. I tried but it
542-
// was running out of PermGen when running the functional tests.
543-
// rather than sink time into investigating, just confining it to
544-
// JDK8 world seems perfectly fine.
545541
${vars.base} {
546542
name: "mima"
547543
uri: ${vars.uris.mima-uri}
548-
// normally MiMa runs on 2.10 (because sbt 0.13 does), so the branch won't
549-
// be merged onto master for quite a while yet
550544
// we don't compile sbt plugins
551545
extra.exclude: ["sbtplugin"]
552546
}

configs/project-refs.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ vars.uris: {
4444
machinist-uri: "https://github.com/typelevel/machinist.git"
4545
macro-compat-uri: "https://github.com/milessabin/macro-compat.git"
4646
macro-paradise-uri: "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12"
47-
mima-uri: "https://github.com/typesafehub/migration-manager.git#scala-2.12"
47+
mima-uri: "https://github.com/typesafehub/migration-manager.git"
4848
minitest-uri: "https://github.com/monix/minitest.git"
4949
monix-uri: "https://github.com/monix/monix.git#series/2.x"
5050
monocle-uri: "https://github.com/julien-truffaut/Monocle.git"

0 commit comments

Comments
 (0)