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

Merge pull request #4 from alexarchambault/develop 

Various stuff
This commit is contained in:
Alexandre Archambault 2018-11-14 15:50:58 +01:00 committed by GitHub
parent 22595d07af 348a9f00c7
commit 58e8dae7e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build.sbt
View File

@ -1,5 +1,4 @@
import Aliases._
import Settings._
inThisBuild(List(
@ -21,24 +20,12 @@ val coursierVersion = "1.1.0-M8"
lazy val `sbt-shared` = project
.in(file("modules/sbt-shared"))
.settings(
plugin,
shared,
libraryDependencies ++= Seq(
"io.get-coursier" %% "coursier" % coursierVersion,
"io.get-coursier" %% "coursier-cache" % coursierVersion
),
// because we don't publish for 2.11 the following declaration
// is more wordy than usual
// once support for sbt 0.13 is removed, this dependency can go away
libraryDependencies ++= {
val dependency = "com.dwijnand" % "sbt-compat" % "1.2.6"
val sbtV = (sbtBinaryVersion in pluginCrossBuild).value
val scalaV = (scalaBinaryVersion in update).value
val m = Defaults.sbtPluginExtra(dependency, sbtV, scalaV)
CrossVersion.partialVersion(scalaVersion.value).collect {
case (2, 10) => m
case (2, 12) => m
}.toList
}
"io.get-coursier" %% "coursier-cache" % coursierVersion,
"org.scala-sbt" %% "librarymanagement-ivy" % "1.0.2"
)
)
lazy val `sbt-coursier` = project

18
project/Aliases.scala
View File

@ -1,18 +0,0 @@
import sbt._
import sbt.Defaults.itSettings
import sbt.Keys._
import sbt.ScriptedPlugin.autoImport._
import sbt.librarymanagement.CrossVersion.partialVersion
object Aliases {
def withScriptedTests: Seq[Def.Setting[_]] =
ScriptedPlugin.globalSettings ++ ScriptedPlugin.projectSettings.filterNot(_.key.key.label == libraryDependencies.key.label) ++ Seq(
libraryDependencies ++= Seq(
"org.scala-sbt" %% "scripted-sbt" % scriptedSbt.value % ScriptedConf,
"org.scala-sbt" % "sbt-launch" % scriptedSbt.value % ScriptedLaunchConf
)
)
}

2
project/Settings.scala
View File

@ -6,8 +6,6 @@ import sbt.ScriptedPlugin.autoImport.{scriptedBufferLog, scriptedLaunchOpts}
import com.typesafe.sbt.pgp._
import coursier.ShadingPlugin.autoImport.{Shading, shadingNamespace}
import Aliases._
object Settings {
def scala212 = "2.12.7"