Merge pull request #294 from eed3si9n/wip/bump

bump IO and Util
This commit is contained in:
eugene yokota 2019-03-22 15:04:47 -04:00 committed by GitHub
commit 5e4a3a557a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 34 deletions

View File

@ -34,7 +34,6 @@ script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
whitesourceCheckPolicies
test
scriptedIvy
scriptedCoursier
packagedArtifacts # ensure that all artifacts for publish package without failure
before_cache:

View File

@ -46,7 +46,7 @@ val mimaSettings = Def settings (
)
lazy val lmRoot = (project in file("."))
.aggregate(lmCore, lmIvy, lmCoursier)
.aggregate(lmCore, lmIvy)
.settings(
inThisBuild(
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"))
.enablePlugins(SbtPlugin)
.settings(
@ -299,15 +280,6 @@ addCommandAlias("scriptedIvy", Seq(
"""set ThisBuild / scriptedLaunchOpts += "-Ddependency.resolution=ivy" """,
"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(
commands += Command.command("release") { state =>
// "clean" ::

View File

@ -3,10 +3,10 @@ import Keys._
import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
val scala212 = "2.12.7"
val scala212 = "2.12.8"
private val ioVersion = "1.3.0-M4"
private val utilVersion = "1.3.0-M2"
private val ioVersion = "1.3.0-M7"
private val utilVersion = "1.3.0-M5"
private val coursierVersion = "1.1.0-M7"
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

View File

@ -1 +1 @@
sbt.version=1.2.6
sbt.version=1.2.8