Skip to content

Update coursier, coursier-jvm to 2.1.0-M7-18-g67daad6a9 #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 18, 2022
Merged

Update coursier, coursier-jvm to 2.1.0-M7-18-g67daad6a9 #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d09082
Update coursier, coursier-jvm to 2.1.0-M7-18-g67daad6a9
scala-steward Oct 14, 2022
22a4cd7
Update proguard / shading config
alexarchambault Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,12 @@ lazy val interface = project
rename("io.github.alexarchambault.windowsansi.**", "coursierapi.shaded.windowsansi.@1"),
rename("concurrentrefhashmap.**", "coursierapi.shaded.concurrentrefhashmap.@1"),
rename("org.apache.commons.compress.**", "coursierapi.shaded.commonscompress.@1"),
rename("org.apache.commons.io.input.**", "coursierapi.shaded.commonsio.@1"),
rename("org.apache.commons.io.**", "coursierapi.shaded.commonsio.@1"),
rename("org.codehaus.plexus.**", "coursierapi.shaded.plexus.@1"),
rename("org.tukaani.xz.**", "coursierapi.shaded.xz.@1"),
rename("org.iq80.snappy.**", "coursierapi.shaded.snappy.@1"),
rename("com.github.plokhotnyuk.jsoniter_scala.core.**", "coursierapi.shaded.jsoniter.@1")
rename("com.github.plokhotnyuk.jsoniter_scala.core.**", "coursierapi.shaded.jsoniter.@1"),
rename("com.github.luben.zstd.**", "coursierapi.shaded.zstd.@1")
)

val processor = new com.eed3si9n.jarjar.JJProcessor(
Expand Down Expand Up @@ -128,13 +129,29 @@ lazy val interface = project
else
Nil

baseOptions ++ maybeJava9Options
val slf4jJarsOptions = {
val updateReport = updateFull.value
val report = updateReport
.configurations
.find(_.configuration.name == Compile.name)
.getOrElse {
sys.error(s"Configuration ${Compile.name} not found in update report (found configs: ${updateReport.configurations.map(_.configuration.name)})")
}
val moduleReports = report.modules
val slf4jJars = moduleReports
.find(r => r.module.organization == "org.slf4j" && r.module.name == "slf4j-api")
.toVector
.flatMap(_.artifacts.map(_._2))
slf4jJars.map(jar => s"-libraryjars $jar")
}

baseOptions ++ maybeJava9Options ++ slf4jJarsOptions
},
Proguard / proguard / javaOptions := Seq("-Xmx3172M"),

// Adding the interface JAR rather than its classes directory.
// The former contains META-INF stuff in particular.
Proguard / proguardInputs := (Proguard / proguardInputs).value.filter(f => !f.isDirectory || f.getName != "classes"),
Proguard / proguardInputs := (Proguard / proguardInputs).value.filter(f => (!f.isDirectory || f.getName != "classes") && !f.getName.startsWith("slf4j-api-")),
Proguard / proguardInputs += (Compile / packageBin).value,

Proguard / proguardBinaryDeps := Settings.getAllBinaryDeps.value,
Expand All @@ -155,6 +172,8 @@ lazy val interface = project
pomPostProcess := { node =>
new RuleTransformer(new RewriteRule {
override def transform(node: XmlNode) = node match {
case elem: Elem if node.label == "dependency" && node.child.exists(n => n.label == "artifactId" && n.text.trim == "slf4j-api") =>
elem
case _: Elem if node.label == "dependency" =>
val org = node.child.find(_.label == "groupId").fold("")(_.text.trim)
val name = node.child.find(_.label == "artifactId").fold("")(_.text.trim)
Expand All @@ -168,9 +187,10 @@ lazy val interface = project
Settings.shared,
Settings.mima(),
libraryDependencies ++= Seq(
"io.get-coursier" %% "coursier" % "2.1.0-M6-53-gb4f448130",
"io.get-coursier" %% "coursier-jvm" % "2.1.0-M6-53-gb4f448130",
"io.get-coursier.jniutils" % "windows-jni-utils-coursierapi" % "0.3.3"
"io.get-coursier" %% "coursier" % "2.1.0-M7-18-g67daad6a9",
"io.get-coursier" %% "coursier-jvm" % "2.1.0-M7-18-g67daad6a9",
"io.get-coursier.jniutils" % "windows-jni-utils-coursierapi" % "0.3.3",
"org.slf4j" % "slf4j-api" % "1.7.36" // no need to shade that one…
),

libraryDependencies += "com.lihaoyi" %% "utest" % "0.8.1" % Test,
Expand Down
3 changes: 2 additions & 1 deletion project/Check.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ object Check {
.filter { n =>
!n.startsWith("META-INF/") && !n.startsWith(ns + "/") &&
n != "reflect.properties" && // scala-reflect adds that
n != "scala-collection-compat.properties" // collection-compat adds that
n != "scala-collection-compat.properties" && // collection-compat adds that
!n.contains("/libzstd-jni-") // com.github.luben:zstd-jni stuff (pulled via plexus-archiver)
}
.toVector
.sorted
Expand Down