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" ::