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

Update coursier to 2.1.0-M7-18-g67daad6a9 (#417) 

* Update coursier to 2.1.0-M7-18-g67daad6a9

* Update shading config

Co-authored-by: Alexandre Archambault <alexandre.archambault@gmail.com>
This commit is contained in:
Scala Steward 2022-10-18 17:38:11 +02:00 committed by GitHub
parent bf9ff1c520
commit 38f75d3de5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
build.sbt
View File

@ -23,7 +23,7 @@ inThisBuild(List(
Global / excludeLintKeys += scriptedBufferLog Global / excludeLintKeys += scriptedBufferLog
Global / excludeLintKeys += scriptedLaunchOpts Global / excludeLintKeys += scriptedLaunchOpts
val coursierVersion0 = "2.1.0-M6-53-gb4f448130" val coursierVersion0 = "2.1.0-M7-18-g67daad6a9"
def dataclassGen(data: Reference) = Def.taskDyn { def dataclassGen(data: Reference) = Def.taskDyn {
val root = (ThisBuild / baseDirectory).value.toURI.toString val root = (ThisBuild / baseDirectory).value.toURI.toString
@ -123,7 +123,42 @@ lazy val `lm-coursier-shaded` = project
"licenses/extreme.indiana.edu.license.TXT", "licenses/extreme.indiana.edu.license.TXT",
"licenses/javolution.license.TXT", "licenses/javolution.license.TXT",
"licenses/thoughtworks.TXT", "licenses/thoughtworks.TXT",
"licenses/" "licenses/",
// zstd files, pulled via plexus-archiver
"darwin/",
"darwin/aarch64/",
"darwin/aarch64/libzstd-jni-1.5.2-4.dylib",
"darwin/x86_64/",
"darwin/x86_64/libzstd-jni-1.5.2-4.dylib",
"freebsd/",
"freebsd/amd64/",
"freebsd/amd64/libzstd-jni-1.5.2-4.so",
"freebsd/i386/",
"freebsd/i386/libzstd-jni-1.5.2-4.so",
"linux/",
"linux/aarch64/",
"linux/aarch64/libzstd-jni-1.5.2-4.so",
"linux/amd64/",
"linux/amd64/libzstd-jni-1.5.2-4.so",
"linux/arm/",
"linux/arm/libzstd-jni-1.5.2-4.so",
"linux/i386/",
"linux/i386/libzstd-jni-1.5.2-4.so",
"linux/loongarch64/",
"linux/loongarch64/libzstd-jni-1.5.2-4.so",
"linux/mips64/",
"linux/mips64/libzstd-jni-1.5.2-4.so",
"linux/ppc64/",
"linux/ppc64/libzstd-jni-1.5.2-4.so",
"linux/ppc64le/",
"linux/ppc64le/libzstd-jni-1.5.2-4.so",
"linux/s390x/",
"linux/s390x/libzstd-jni-1.5.2-4.so",
"win/",
"win/amd64/",
"win/amd64/libzstd-jni-1.5.2-4.dll",
"win/x86/",
"win/x86/libzstd-jni-1.5.2-4.dll",
), ),
shadingRules ++= { shadingRules ++= {
val toShade = Seq( val toShade = Seq(
@ -140,7 +175,10 @@ lazy val `lm-coursier-shaded` = project
"org.codehaus", "org.codehaus",
"org.iq80", "org.iq80",
"org.tukaani", "org.tukaani",
"com.github.plokhotnyuk.jsoniter_scala" "com.github.plokhotnyuk.jsoniter_scala",
"scala.cli",
"com.github.luben.zstd",
"javax.inject" // hope shading this is fine… It's probably pulled via plexus-archiver, that sbt shouldn't use anyway…
) )
for (ns <- toShade) for (ns <- toShade)
yield ShadingRule.moveUnder(ns, "lmcoursier.internal.shaded") yield ShadingRule.moveUnder(ns, "lmcoursier.internal.shaded")
@ -151,6 +189,7 @@ lazy val `lm-coursier-shaded` = project
"net.hamnaberg" %% "dataclass-annotation" % dataclassScalafixV % Provided, "net.hamnaberg" %% "dataclass-annotation" % dataclassScalafixV % Provided,
"org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1", "org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1",
"org.scala-lang.modules" %% "scala-xml" % "1.3.0", // depending on that one so that it doesn't get shaded "org.scala-lang.modules" %% "scala-xml" % "1.3.0", // depending on that one so that it doesn't get shaded
"org.slf4j" % "slf4j-api" % "1.7.36", // depending on that one so that it doesn't get shaded either
lmIvy.value, lmIvy.value,
"org.scalatest" %% "scalatest" % "3.2.14" % Test "org.scalatest" %% "scalatest" % "3.2.14" % Test
) )