From 7f192743049aeb6f90711255936d97b9f515ba03 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 22 Mar 2019 13:47:32 -0400 Subject: [PATCH 1/3] sbt 1.2.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 7c58a83ab..c0bab0494 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.6 +sbt.version=1.2.8 From 83a28b0b3d5ac20e96815aaceac4e3379656365f Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 22 Mar 2019 13:53:17 -0400 Subject: [PATCH 2/3] bump IO and Util --- project/Dependencies.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2882abc28..946c741fa 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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 From 5645e36ee19ea740233be1253d87ce974cfb6b93 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 22 Mar 2019 13:58:56 -0400 Subject: [PATCH 3/3] Remove lmCoursier There's an implementation of lmCoursier in the coursier project itself, so this seems redundant here. --- .travis.yml | 1 - build.sbt | 30 +----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5cee6b49b..243fb2eef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/build.sbt b/build.sbt index 7b5d143f6..01d30ad43 100644 --- a/build.sbt +++ b/build.sbt @@ -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" ::