mirror of https://github.com/sbt/sbt.git
commit
5e4a3a557a
|
|
@ -34,7 +34,6 @@ script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
|
||||||
whitesourceCheckPolicies
|
whitesourceCheckPolicies
|
||||||
test
|
test
|
||||||
scriptedIvy
|
scriptedIvy
|
||||||
scriptedCoursier
|
|
||||||
packagedArtifacts # ensure that all artifacts for publish package without failure
|
packagedArtifacts # ensure that all artifacts for publish package without failure
|
||||||
|
|
||||||
before_cache:
|
before_cache:
|
||||||
|
|
|
||||||
30
build.sbt
30
build.sbt
|
|
@ -46,7 +46,7 @@ val mimaSettings = Def settings (
|
||||||
)
|
)
|
||||||
|
|
||||||
lazy val lmRoot = (project in file("."))
|
lazy val lmRoot = (project in file("."))
|
||||||
.aggregate(lmCore, lmIvy, lmCoursier)
|
.aggregate(lmCore, lmIvy)
|
||||||
.settings(
|
.settings(
|
||||||
inThisBuild(
|
inThisBuild(
|
||||||
Seq(
|
Seq(
|
||||||
|
|
@ -260,25 +260,6 @@ lazy val lmIvy = (project in file("ivy"))
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
lazy val lmCoursier = (project in file("coursier"))
|
|
||||||
.enablePlugins(ContrabandPlugin, JsonCodecPlugin)
|
|
||||||
.dependsOn(lmIvy)
|
|
||||||
.settings(
|
|
||||||
commonSettings,
|
|
||||||
name := "librarymanagement-coursier",
|
|
||||||
libraryDependencies ++= Seq(coursier,
|
|
||||||
coursierCache,
|
|
||||||
scalaTest % Test,
|
|
||||||
scalaCheck % Test
|
|
||||||
),
|
|
||||||
managedSourceDirectories in Compile +=
|
|
||||||
baseDirectory.value / "src" / "main" / "contraband-scala",
|
|
||||||
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
|
|
||||||
contrabandFormatsForType in generateContrabands in Compile := DatatypeConfig.getFormats,
|
|
||||||
scalacOptions in (Compile, console) --=
|
|
||||||
Vector("-Ywarn-unused-import", "-Ywarn-unused", "-Xlint")
|
|
||||||
)
|
|
||||||
|
|
||||||
lazy val lmScriptedTest = (project in file("scripted-test"))
|
lazy val lmScriptedTest = (project in file("scripted-test"))
|
||||||
.enablePlugins(SbtPlugin)
|
.enablePlugins(SbtPlugin)
|
||||||
.settings(
|
.settings(
|
||||||
|
|
@ -299,15 +280,6 @@ addCommandAlias("scriptedIvy", Seq(
|
||||||
"""set ThisBuild / scriptedLaunchOpts += "-Ddependency.resolution=ivy" """,
|
"""set ThisBuild / scriptedLaunchOpts += "-Ddependency.resolution=ivy" """,
|
||||||
"lmScriptedTest/scripted").mkString(";",";",""))
|
"lmScriptedTest/scripted").mkString(";",";",""))
|
||||||
|
|
||||||
addCommandAlias("scriptedCoursier", Seq(
|
|
||||||
"lmCore/publishLocal",
|
|
||||||
"lmIvy/publishLocal",
|
|
||||||
"lmCoursier/publishLocal",
|
|
||||||
"lmScriptedTest/clean",
|
|
||||||
"""set ThisBuild / scriptedTestLMImpl := "coursier"""",
|
|
||||||
"""set ThisBuild / scriptedLaunchOpts += "-Ddependency.resolution=coursier" """,
|
|
||||||
"lmScriptedTest/scripted").mkString(";",";",""))
|
|
||||||
|
|
||||||
def customCommands: Seq[Setting[_]] = Seq(
|
def customCommands: Seq[Setting[_]] = Seq(
|
||||||
commands += Command.command("release") { state =>
|
commands += Command.command("release") { state =>
|
||||||
// "clean" ::
|
// "clean" ::
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,10 @@ import Keys._
|
||||||
import sbt.contraband.ContrabandPlugin.autoImport._
|
import sbt.contraband.ContrabandPlugin.autoImport._
|
||||||
|
|
||||||
object Dependencies {
|
object Dependencies {
|
||||||
val scala212 = "2.12.7"
|
val scala212 = "2.12.8"
|
||||||
|
|
||||||
private val ioVersion = "1.3.0-M4"
|
private val ioVersion = "1.3.0-M7"
|
||||||
private val utilVersion = "1.3.0-M2"
|
private val utilVersion = "1.3.0-M5"
|
||||||
private val coursierVersion = "1.1.0-M7"
|
private val coursierVersion = "1.1.0-M7"
|
||||||
|
|
||||||
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
|
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
sbt.version=1.2.6
|
sbt.version=1.2.8
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue