Skip to content

Commit 08c6c1e

Browse files
authored
Merge pull request #535 from SethTisue/sbt-0.13.16
upgrade to sbt 0.13.16 + refresh MiMA + reinstate conductr-lib + add scalastyle + refresh lightbend-emoji
2 parents 236941a + 490a2a1 commit 08c6c1e

File tree

2 files changed

+32
-14
lines changed

2 files changed

+32
-14
lines changed

configs/community.dbuild

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ include file(".dbuild/resolvers.conf")
3030

3131
vars {
3232
default-commands: []
33-
sbt-version: "0.13.15"
33+
sbt-version: "0.13.16-RC1"
3434
}
3535

3636
//// compiler options manipulation
@@ -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
}
@@ -867,6 +861,22 @@ build += {
867861
extra.projects: ["coreJVM", "tckTests"] // no Scala.js, no benchmarks
868862
}
869863

864+
${vars.base} {
865+
name: "conductr-lib"
866+
uri: ${vars.uris.conductr-lib-uri}
867+
extra.exclude: [
868+
// we don't have Lagom yet
869+
"lagom13JavaConductRBundleLib", "lagom13ScalaConductRBundleLib"
870+
// didn't compile (July 2017)
871+
"akka24ConductRClientLib"
872+
// not our Akka version
873+
"akka25Common", "akka25ConductRBundleLib", "akka25ConductRClientLib", "akka25TestLib"
874+
// Play stuff didn't work, maybe try again later?
875+
"play25ConductRBundleLib", "play25ConductRClientLib", "play25Common"
876+
"play26ConductRBundleLib", "play26ConductRClientLib", "play26Common"
877+
]
878+
}
879+
870880
// this was added because conductr-lib's Play integration depended on it,
871881
// but we ended up not including that integration (for now anyway?), so
872882
// nothing depends on this. leaving it in since we might as well, but
@@ -1111,11 +1121,11 @@ build += {
11111121
uri: ${vars.uris.scalaj-http-uri}
11121122
}
11131123

1114-
// forked (April 2017) to get rid of the usual bintray-sbt stuff that
1115-
// makes dbuild upset
1124+
// forked (April 2017; updated July 2017) to get rid of the usual bintray-sbt stuff
1125+
// that makes dbuild upset
11161126
${vars.base} {
1117-
name: "typesafe-emoji"
1118-
uri: ${vars.uris.typesafe-emoji-uri}
1127+
name: "lightbend-emoji"
1128+
uri: ${vars.uris.lightbend-emoji-uri}
11191129
}
11201130

11211131
// others are not depending on this yet ("not ready for general
@@ -1194,4 +1204,11 @@ build += {
11941204
extra.test-tasks: ["compile"]
11951205
}
11961206

1207+
// forked (July 2017) to get rid of the usual bintray-sbt stuff that
1208+
// makes dbuild upset
1209+
${vars.base} {
1210+
name: "scalastyle"
1211+
uri: ${vars.uris.scalastyle-uri}
1212+
}
1213+
11971214
]}

configs/project-refs.conf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ vars.uris: {
2121
catalysts-uri: "https://github.com/typelevel/catalysts.git"
2222
cats-uri: "https://github.com/typelevel/cats.git#669a0235" # was master
2323
cats-effect-uri: "https://github.com/typelevel/cats-effect.git#2e0e05c" # was master
24-
24+
conductr-lib-uri: "https://github.com/typesafehub/conductr-lib.git"
2525
discipline-uri: "https://github.com/typelevel/discipline.git#v0.7"
2626
dispatch-uri: "https://github.com/dispatch/reboot.git#0.12.x"
2727
doodle-uri: "https://github.com/scalacommunitybuild/doodle.git#community-build-2.12"
@@ -40,11 +40,12 @@ vars.uris: {
4040
kind-projector-uri: "https://github.com/non/kind-projector.git"
4141
kxbmap-configs-uri: "https://github.com/kxbmap/configs.git"
4242
lift-json-uri: "https://github.com/lift/framework.git"
43+
lightbend-emoji-uri: "https://github.com/scalacommunitybuild/lightbend-emoji.git#community-build-2.12"
4344
log4s-uri: "https://github.com/Log4s/log4s.git"
4445
machinist-uri: "https://github.com/typelevel/machinist.git"
4546
macro-compat-uri: "https://github.com/milessabin/macro-compat.git"
4647
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"
48+
mima-uri: "https://github.com/typesafehub/migration-manager.git"
4849
minitest-uri: "https://github.com/monix/minitest.git"
4950
monix-uri: "https://github.com/monix/monix.git#series/2.x"
5051
monocle-uri: "https://github.com/julien-truffaut/Monocle.git"
@@ -85,6 +86,7 @@ vars.uris: {
8586
scalapb-uri: "https://github.com/scalapb/ScalaPB.git#268318c" # was master
8687
scalaprops-uri: "https://github.com/scalaprops/scalaprops.git"
8788
scalariform-uri: "https://github.com/scala-ide/scalariform.git"
89+
scalastyle-uri: "https://github.com/scalacommunitybuild/scalastyle.git#community-build-2.12"
8890
scalatags-uri: "https://github.com/lihaoyi/scalatags.git"
8991
scalatest-uri: "https://github.com/scalatest/scalatest.git#3.0.x"
9092
scalatex-uri: "https://github.com/lihaoyi/scalatex.git"
@@ -107,7 +109,6 @@ vars.uris: {
107109
twirl-uri: "https://github.com/playframework/twirl.git"
108110
twitter-util-uri: "https://github.com/twitter/util.git#develop"
109111
twotails-uri: "https://github.com/wheaties/TwoTails.git"
110-
typesafe-emoji-uri: "https://github.com/scalacommunitybuild/typesafe-emoji.git#community-build-2.12"
111112
unfiltered-uri: "https://github.com/unfiltered/unfiltered.git#0.9.0"
112113
upickle-uri: "https://github.com/scalacommunitybuild/upickle-pprint.git#community-build-2.12"
113114
utest-uri: "https://github.com/scalacommunitybuild/utest.git#community-build-2.12"

0 commit comments

Comments
 (0)