mirror of https://github.com/sbt/sbt.git
Scala 2.12.7
This commit is contained in:
parent
e28382c667
commit
b0ea8ec55f
|
|
@ -3,12 +3,12 @@ jdk: oraclejdk8
|
|||
|
||||
scala:
|
||||
- 2.11.12
|
||||
- 2.12.4
|
||||
- 2.12.7
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- scala: 2.12.4
|
||||
jdk: oraclejdk9
|
||||
- scala: 2.12.7
|
||||
jdk: openjdk11
|
||||
|
||||
script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
|
||||
++$TRAVIS_SCALA_VERSION
|
||||
|
|
|
|||
|
|
@ -842,7 +842,7 @@ private[sbt] object IvySbt {
|
|||
}) foreach {
|
||||
case (_, vs) if vs.size > 1 =>
|
||||
val v0 = vs.head
|
||||
(vs find { _.revision != v0.revision }) foreach { v =>
|
||||
(vs find { _.revision != v0.revision }) foreach { _ =>
|
||||
out += s" * ${v0.organization}:${v0.name}:(" + (vs map { _.revision })
|
||||
.mkString(", ") + ")"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ object IvyActions {
|
|||
|
||||
/** Installs the dependencies of the given 'module' from the resolver named 'from' to the resolver named 'to'.*/
|
||||
def install(module: IvySbt#Module, from: String, to: String, log: Logger): Unit = {
|
||||
module.withModule(log) { (ivy, md, default) =>
|
||||
module.withModule(log) { (ivy, md, _) =>
|
||||
for (dependency <- md.getDependencies) {
|
||||
log.info("Installing " + dependency)
|
||||
val options = new InstallOptions
|
||||
|
|
@ -68,7 +68,7 @@ object IvyActions {
|
|||
val file = configuration.file.getOrElse(sys.error("file must be specified."))
|
||||
val moduleInfo = configuration.moduleInfo.getOrElse(sys.error("moduleInfo must be specified."))
|
||||
val extra = configuration.extra.getOrElse(scala.xml.NodeSeq.Empty)
|
||||
module.withModule(log) { (ivy, md, default) =>
|
||||
module.withModule(log) { (ivy, md, _) =>
|
||||
(new MakePom(log)).write(
|
||||
ivy,
|
||||
md,
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ object IvyScalaUtil {
|
|||
log: Logger
|
||||
): Unit = {
|
||||
val scalaVersionConfigs: String => Boolean =
|
||||
if (scalaVersionConfigs0.isEmpty) (c: String) => false else scalaVersionConfigs0.toSet
|
||||
if (scalaVersionConfigs0.isEmpty) (_: String) => false else scalaVersionConfigs0.toSet
|
||||
def binaryScalaWarning(dep: DependencyDescriptor): Option[String] = {
|
||||
val id = dep.getDependencyRevisionId
|
||||
val depBinaryVersion = CrossVersion.binaryScalaVersion(id.getRevision)
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ import sbt.contraband.ContrabandPlugin.autoImport._
|
|||
|
||||
object Dependencies {
|
||||
val scala211 = "2.11.12"
|
||||
val scala212 = "2.12.6"
|
||||
val scala212 = "2.12.7"
|
||||
|
||||
private val ioVersion = "1.2.0"
|
||||
private val utilVersion = "1.2.0"
|
||||
private val ioVersion = "1.2.1"
|
||||
private val utilVersion = "1.2.2"
|
||||
|
||||
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue