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

Bump Scala version to 2.11.8

This commit is contained in:
Eugene Yokota 2016-04-29 02:39:34 -04:00
parent b285cf114d
commit 3f08158bb6
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
build.sbt
View File

@ -19,11 +19,10 @@ def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq(
)) ))
def commonSettings: Seq[Setting[_]] = Seq[SettingsDefinition]( def commonSettings: Seq[Setting[_]] = Seq[SettingsDefinition](
scalaVersion := scala210, scalaVersion := scala211,
publishArtifact in packageDoc := false, publishArtifact in packageDoc := false,
publishMavenStyle := false, publishMavenStyle := false,
componentID := None, componentID := None,
crossPaths := false,
resolvers += Resolver.typesafeIvyRepo("releases"), resolvers += Resolver.typesafeIvyRepo("releases"),
resolvers += Resolver.sonatypeRepo("snapshots"), resolvers += Resolver.sonatypeRepo("snapshots"),
resolvers += Resolver.bintrayRepo("sbt", "maven-releases"), resolvers += Resolver.bintrayRepo("sbt", "maven-releases"),
@ -31,7 +30,7 @@ def commonSettings: Seq[Setting[_]] = Seq[SettingsDefinition](
testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"), testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"),
javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"), javacOptions in compile ++= Seq("-target", "6", "-source", "6", "-Xlint", "-Xlint:-serial"),
incOptions := incOptions.value.withNameHashing(true), incOptions := incOptions.value.withNameHashing(true),
crossScalaVersions := Seq(scala210), crossScalaVersions := Seq(scala211),
bintrayPackage := (bintrayPackage in ThisBuild).value, bintrayPackage := (bintrayPackage in ThisBuild).value,
bintrayRepository := (bintrayRepository in ThisBuild).value, bintrayRepository := (bintrayRepository in ThisBuild).value,
mimaDefaultSettings, mimaDefaultSettings,
@ -77,6 +76,7 @@ lazy val bundledLauncherProj =
description := "sbt application launcher", description := "sbt application launcher",
publishArtifact in packageSrc := false, publishArtifact in packageSrc := false,
autoScalaLibrary := false, autoScalaLibrary := false,
crossPaths := false,
publish := Release.deployLauncher.value, publish := Release.deployLauncher.value,
publishLauncher := Release.deployLauncher.value, publishLauncher := Release.deployLauncher.value,
packageBin in Compile := sbtLaunchJar.value packageBin in Compile := sbtLaunchJar.value
@ -199,15 +199,15 @@ lazy val sbtProj = (project in sbtPath).
libraryDependencies ++= Seq(compilerBrdige) libraryDependencies ++= Seq(compilerBrdige)
) )
lazy val mavenResolverPluginProj = (project in file("sbt-maven-resolver")). // lazy val mavenResolverPluginProj = (project in file("sbt-maven-resolver")).
dependsOn(sbtProj). // dependsOn(sbtProj).
settings( // settings(
baseSettings, // baseSettings,
sbtBinaryVersion := "1.0.0-SNAPSHOT", // sbtBinaryVersion := "1.0.0-SNAPSHOT",
name := "sbt-maven-resolver", // name := "sbt-maven-resolver",
libraryDependencies ++= aetherLibs ++ Seq(utilTesting % Test, (libraryManagement % Test).classifier("tests"), libraryManagement % Test), // libraryDependencies ++= aetherLibs ++ Seq(utilTesting % Test, (libraryManagement % Test).classifier("tests"), libraryManagement % Test),
sbtPlugin := true // sbtPlugin := true
) // )
def scriptedTask: Def.Initialize[InputTask[Unit]] = Def.inputTask { def scriptedTask: Def.Initialize[InputTask[Unit]] = Def.inputTask {
val result = scriptedSource(dir => (s: State) => Scripted.scriptedParser(dir)).parsed val result = scriptedSource(dir => (s: State) => Scripted.scriptedParser(dir)).parsed
@ -231,7 +231,7 @@ lazy val myProvided = config("provided") intransitive
def allProjects = Seq( def allProjects = Seq(
testingProj, testAgentProj, taskProj, stdTaskProj, runProj, testingProj, testAgentProj, taskProj, stdTaskProj, runProj,
scriptedSbtProj, scriptedPluginProj, scriptedSbtProj, scriptedPluginProj,
actionsProj, commandProj, mainSettingsProj, mainProj, sbtProj, bundledLauncherProj, mavenResolverPluginProj) actionsProj, commandProj, mainSettingsProj, mainProj, sbtProj, bundledLauncherProj)
def projectsWithMyProvided = allProjects.map(p => p.copy(configurations = (p.configurations.filter(_ != Provided)) :+ myProvided)) def projectsWithMyProvided = allProjects.map(p => p.copy(configurations = (p.configurations.filter(_ != Provided)) :+ myProvided))
lazy val nonRoots = projectsWithMyProvided.map(p => LocalProject(p.id)) lazy val nonRoots = projectsWithMyProvided.map(p => LocalProject(p.id))
@ -259,7 +259,7 @@ def otherRootSettings = Seq(
} }
)) ))
lazy val docProjects: ScopeFilter = ScopeFilter( lazy val docProjects: ScopeFilter = ScopeFilter(
inAnyProject -- inProjects(sbtRoot, sbtProj, scriptedSbtProj, scriptedPluginProj, mavenResolverPluginProj), inAnyProject -- inProjects(sbtRoot, sbtProj, scriptedSbtProj, scriptedPluginProj),
inConfigurations(Compile) inConfigurations(Compile)
) )
def fullDocSettings = Util.baseScalacOptions ++ Docs.settings ++ Sxr.settings ++ Seq( def fullDocSettings = Util.baseScalacOptions ++ Docs.settings ++ Sxr.settings ++ Seq(
@ -295,7 +295,7 @@ lazy val otherProjects: ScopeFilter = ScopeFilter(
testingProj, testAgentProj, taskProj, testingProj, testAgentProj, taskProj,
scriptedSbtProj, scriptedPluginProj, scriptedSbtProj, scriptedPluginProj,
commandProj, mainSettingsProj, mainProj, commandProj, mainSettingsProj, mainProj,
sbtProj, mavenResolverPluginProj), sbtProj),
inConfigurations(Test) inConfigurations(Test)
) )

2
project/Dependencies.scala
View File

@ -6,7 +6,7 @@ object Dependencies {
lazy val scala292 = "2.9.2" lazy val scala292 = "2.9.2"
lazy val scala293 = "2.9.3" lazy val scala293 = "2.9.3"
lazy val scala210 = "2.10.6" lazy val scala210 = "2.10.6"
lazy val scala211 = "2.11.7" lazy val scala211 = "2.11.8"
// sbt modules // sbt modules
val utilVersion = "0.1.0-M10" val utilVersion = "0.1.0-M10"