@@ -30,7 +30,7 @@ include file(".dbuild/resolvers.conf")
30
30
31
31
vars {
32
32
default-commands: []
33
- sbt-version: "0.13.15 "
33
+ sbt-version: "0.13.16-RC1 "
34
34
}
35
35
36
36
//// compiler options manipulation
@@ -538,15 +538,9 @@ build += {
538
538
extra.options: ["-DSKIP_FLAKY=true"]
539
539
}
540
540
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.
545
541
${vars.base} {
546
542
name: "mima"
547
543
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
550
544
// we don't compile sbt plugins
551
545
extra.exclude: ["sbtplugin"]
552
546
}
@@ -867,6 +861,22 @@ build += {
867
861
extra.projects: ["coreJVM", "tckTests"] // no Scala.js, no benchmarks
868
862
}
869
863
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
+
870
880
// this was added because conductr-lib's Play integration depended on it,
871
881
// but we ended up not including that integration (for now anyway?), so
872
882
// nothing depends on this. leaving it in since we might as well, but
@@ -1111,11 +1121,11 @@ build += {
1111
1121
uri: ${vars.uris.scalaj-http-uri}
1112
1122
}
1113
1123
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
1116
1126
${vars.base} {
1117
- name: "typesafe -emoji"
1118
- uri: ${vars.uris.typesafe -emoji-uri}
1127
+ name: "lightbend -emoji"
1128
+ uri: ${vars.uris.lightbend -emoji-uri}
1119
1129
}
1120
1130
1121
1131
// others are not depending on this yet ("not ready for general
@@ -1194,4 +1204,11 @@ build += {
1194
1204
extra.test-tasks: ["compile"]
1195
1205
}
1196
1206
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
+
1197
1214
]}
0 commit comments