From a3d3dc3e14620cd40695b237adb7655ef042c49e Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Fri, 15 Mar 2024 07:31:17 +0100 Subject: [PATCH] Update jarjar-abrams-core from 1.9.0 to 1.14.0 (#3085) This includes one code change due to changed API. Pull request: https://github.com/com-lihaoyi/mill/pull/3085 --- build.sc | 2 +- scalalib/src/mill/scalalib/Assembly.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sc b/build.sc index 3a1e623f983..89c5579f13e 100644 --- a/build.sc +++ b/build.sc @@ -186,7 +186,7 @@ object Deps { // keep in sync with doc/antora/antory.yml val bsp4j = ivy"ch.epfl.scala:bsp4j:2.2.0-M1" val fansi = ivy"com.lihaoyi::fansi:0.4.0" - val jarjarabrams = ivy"com.eed3si9n.jarjarabrams::jarjar-abrams-core:1.9.0" + val jarjarabrams = ivy"com.eed3si9n.jarjarabrams::jarjar-abrams-core:1.14.0" val requests = ivy"com.lihaoyi::requests:0.8.0" /** Used to manage transitive versions. */ diff --git a/scalalib/src/mill/scalalib/Assembly.scala b/scalalib/src/mill/scalalib/Assembly.scala index 78baebdfa99..19f5d8a0d77 100644 --- a/scalalib/src/mill/scalalib/Assembly.scala +++ b/scalalib/src/mill/scalalib/Assembly.scala @@ -133,7 +133,7 @@ object Assembly { if (shadeRules.isEmpty) (name: String, inputStream: UnopenedInputStream) => Some(name -> inputStream) else { - val shader = Shader.bytecodeShader(shadeRules, verbose = false) + val shader = Shader.bytecodeShader(shadeRules, verbose = false, skipManifest = true) (name: String, inputStream: UnopenedInputStream) => { val is = inputStream() shader(Streamable.bytes(is), name).map {