From c5500395395aaf0761e1d423be60d8d7abffbfb7 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 27 Oct 2023 01:49:53 -0400 Subject: [PATCH] Jar Jar Abrams 1.13.0 --- build.sbt | 2 +- src/main/scala/sbtassembly/Assembly.scala | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 6b8c3041..4c29763e 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ lazy val root = (project in file(".")) name := "sbt-assembly" scalacOptions := Seq("-deprecation", "-unchecked", "-Dscalac.patmat.analysisBudget=1024", "-Xfuture") libraryDependencies ++= Seq( - "com.eed3si9n.jarjarabrams" %% "jarjar-abrams-core" % "1.9.0", + "com.eed3si9n.jarjarabrams" %% "jarjar-abrams-core" % "1.13.0", ) (pluginCrossBuild / sbtVersion) := { scalaBinaryVersion.value match { diff --git a/src/main/scala/sbtassembly/Assembly.scala b/src/main/scala/sbtassembly/Assembly.scala index b0f9e18a..43456c44 100644 --- a/src/main/scala/sbtassembly/Assembly.scala +++ b/src/main/scala/sbtassembly/Assembly.scala @@ -488,7 +488,11 @@ object Assembly { if (shadeRules.isEmpty) (name: String, inputStream: LazyInputStream) => Some(name -> inputStream) else { - val bytecodeShader = Shader.bytecodeShader(shadeRules, verbose = false) + val bytecodeShader = Shader.bytecodeShader( + shadeRules, + verbose = false, + skipManifest = false, + ) (name: String, inputStream: LazyInputStream) => { val is = inputStream() val shadeResult = bytecodeShader(Streamable.bytes(is), name)