mirror of https://github.com/sbt/sbt.git
[2.x] Exclude Scala libraries from lm-coursier-shaded
This commit is contained in:
parent
2cef7222f1
commit
9d94423f24
48
build.sbt
48
build.sbt
|
|
@ -1447,20 +1447,6 @@ lazy val lmCoursierSettings: Seq[Setting[_]] = Def.settings(
|
|||
),
|
||||
)
|
||||
|
||||
lazy val lmCoursierDependencies = Def.settings(
|
||||
libraryDependencies ++= Seq(
|
||||
coursier,
|
||||
coursierSbtMavenRepo,
|
||||
"io.get-coursier.jniutils" % "windows-jni-utils-lmcoursier" % jniUtilsVersion,
|
||||
"net.hamnaberg" %% "dataclass-annotation" % dataclassScalafixVersion % Provided,
|
||||
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
|
||||
),
|
||||
excludeDependencies ++= Seq(
|
||||
ExclusionRule("org.scala-lang.modules", "scala-xml_2.13"),
|
||||
ExclusionRule("org.scala-lang.modules", "scala-collection-compat_2.13")
|
||||
),
|
||||
)
|
||||
|
||||
lazy val lmCoursierDefinitions = project
|
||||
.in(file("lm-coursier/definitions"))
|
||||
.disablePlugins(MimaPlugin)
|
||||
|
|
@ -1478,6 +1464,20 @@ lazy val lmCoursierDefinitions = project
|
|||
)
|
||||
.dependsOn(lmIvy % "provided")
|
||||
|
||||
lazy val lmCoursierDependencies = Def.settings(
|
||||
libraryDependencies ++= Seq(
|
||||
coursier,
|
||||
coursierSbtMavenRepo,
|
||||
"io.get-coursier.jniutils" % "windows-jni-utils-lmcoursier" % jniUtilsVersion,
|
||||
"net.hamnaberg" %% "dataclass-annotation" % dataclassScalafixVersion % Provided,
|
||||
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
|
||||
),
|
||||
excludeDependencies ++= Seq(
|
||||
ExclusionRule("org.scala-lang.modules", "scala-xml_2.13"),
|
||||
ExclusionRule("org.scala-lang.modules", "scala-collection-compat_2.13")
|
||||
),
|
||||
)
|
||||
|
||||
lazy val lmCoursier = project
|
||||
.in(file("lm-coursier"))
|
||||
.settings(
|
||||
|
|
@ -1503,23 +1503,13 @@ lazy val lmCoursierShaded = project
|
|||
Mima.lmCoursierShadedFilters,
|
||||
Compile / sources := (lmCoursier / Compile / sources).value,
|
||||
lmCoursierDependencies,
|
||||
autoScalaLibrary := false,
|
||||
libraryDependencies ++= Seq(
|
||||
scala3Library % Provided,
|
||||
),
|
||||
assembly / assemblyOption ~= { _.withIncludeScala(false) },
|
||||
conflictWarning := ConflictWarning.disable,
|
||||
Utils.noPublish,
|
||||
// shadedModules ++= Set(
|
||||
// "io.get-coursier" %% "coursier",
|
||||
// "io.get-coursier" %% "coursier-sbt-maven-repository",
|
||||
// "io.get-coursier.jniutils" % "windows-jni-utils-lmcoursier"
|
||||
// ),
|
||||
// validNamespaces += "lmcoursier",
|
||||
// validEntries ++= Set(
|
||||
// // FIXME Ideally, we should just strip those from the resulting JAR…
|
||||
// "README", // from google-collections via plexus-archiver (see below)
|
||||
// // from plexus-util via plexus-archiver (see below)
|
||||
// "licenses/extreme.indiana.edu.license.TXT",
|
||||
// "licenses/javolution.license.TXT",
|
||||
// "licenses/thoughtworks.TXT",
|
||||
// "licenses/",
|
||||
// ),
|
||||
assemblyShadeRules := {
|
||||
val namespacesToShade = Seq(
|
||||
"coursier",
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ object Dependencies {
|
|||
"com.eed3si9n.remoteapis.shaded" % "shaded-remoteapis-java" % "2.3.0-M1-52317e00d8d4c37fa778c628485d220fb68a8d08"
|
||||
|
||||
val scalaCompiler = "org.scala-lang" %% "scala3-compiler" % scala3
|
||||
val scala3Library = "org.scala-lang" %% "scala3-library" % scala3
|
||||
|
||||
val scalaXml = Def.setting(
|
||||
if (scalaBinaryVersion.value == "3") {
|
||||
|
|
|
|||
Loading…
Reference in New Issue