luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scala 2.12.7

This commit is contained in:
Eugene Yokota 2018-09-28 04:42:20 -04:00
parent e28382c667
commit b0ea8ec55f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -3,12 +3,12 @@ jdk: oraclejdk8
scala: scala:
- 2.11.12 - 2.11.12
- 2.12.4 - 2.12.7
matrix: matrix:
include: include:
- scala: 2.12.4 - scala: 2.12.7
jdk: oraclejdk9 jdk: openjdk11
script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
++$TRAVIS_SCALA_VERSION ++$TRAVIS_SCALA_VERSION

2
ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
View File

@ -842,7 +842,7 @@ private[sbt] object IvySbt {
}) foreach { }) foreach {
case (_, vs) if vs.size > 1 => case (_, vs) if vs.size > 1 =>
val v0 = vs.head 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 }) out += s" * ${v0.organization}:${v0.name}:(" + (vs map { _.revision })
.mkString(", ") + ")" .mkString(", ") + ")"
} }

4
ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala
View File

@ -30,7 +30,7 @@ object IvyActions {
/** Installs the dependencies of the given 'module' from the resolver named 'from' to the resolver named 'to'.*/ /** 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 = { 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) { for (dependency <- md.getDependencies) {
log.info("Installing " + dependency) log.info("Installing " + dependency)
val options = new InstallOptions val options = new InstallOptions
@ -68,7 +68,7 @@ object IvyActions {
val file = configuration.file.getOrElse(sys.error("file must be specified.")) val file = configuration.file.getOrElse(sys.error("file must be specified."))
val moduleInfo = configuration.moduleInfo.getOrElse(sys.error("moduleInfo must be specified.")) val moduleInfo = configuration.moduleInfo.getOrElse(sys.error("moduleInfo must be specified."))
val extra = configuration.extra.getOrElse(scala.xml.NodeSeq.Empty) val extra = configuration.extra.getOrElse(scala.xml.NodeSeq.Empty)
module.withModule(log) { (ivy, md, default) => module.withModule(log) { (ivy, md, _) =>
(new MakePom(log)).write( (new MakePom(log)).write(
ivy, ivy,
md, md,

2
ivy/src/main/scala/sbt/internal/librarymanagement/IvyScalaUtil.scala
View File

@ -133,7 +133,7 @@ object IvyScalaUtil {
log: Logger log: Logger
): Unit = { ): Unit = {
val scalaVersionConfigs: String => Boolean = 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] = { def binaryScalaWarning(dep: DependencyDescriptor): Option[String] = {
val id = dep.getDependencyRevisionId val id = dep.getDependencyRevisionId
val depBinaryVersion = CrossVersion.binaryScalaVersion(id.getRevision) val depBinaryVersion = CrossVersion.binaryScalaVersion(id.getRevision)

6
project/Dependencies.scala
View File

@ -4,10 +4,10 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies { object Dependencies {
val scala211 = "2.11.12" val scala211 = "2.11.12"
val scala212 = "2.12.6" val scala212 = "2.12.7"
private val ioVersion = "1.2.0" private val ioVersion = "1.2.1"
private val utilVersion = "1.2.0" private val utilVersion = "1.2.2"
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val sbtIO = "org.scala-sbt" %% "io" % ioVersion