Skip to content

Update jarjar-abrams-core to 1.8.1 #243

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 6 commits into from
Aug 11, 2022
Merged

Update jarjar-abrams-core to 1.8.1 #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26ebfcb
Update jarjar-abrams-core to 1.8.1
scala-steward Feb 13, 2022
426826b
Revert commit(s) 26ebfcb
scala-steward Jul 11, 2022
4835d7b
Merge branch 'master' into update/jarjar-abrams-core-1.8.1
scala-steward Jul 11, 2022
a082bf3
Update jarjar-abrams-core to 1.8.1
scala-steward Jul 11, 2022
760af14
Merge branch 'master' into update/jarjar-abrams-core-1.8.1
alexarchambault Aug 11, 2022
f35baf7
Override service file in final JAR
alexarchambault Aug 11, 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
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ lazy val interface = project
sys.error(s"META-INF/services/coursier.jniutils.NativeApi not found in $orig")
}

ZipUtil.addToZip(
ZipUtil.addOrOverwriteInZip(
tmpDest1,
dest,
Seq(
Expand Down
6 changes: 4 additions & 2 deletions project/ZipUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,16 @@ object ZipUtil {

}

def addToZip(sourceZip: File, destZip: File, toAdd: Seq[(String, Array[Byte])]): Unit = {
def addOrOverwriteInZip(sourceZip: File, destZip: File, toAdd: Seq[(String, Array[Byte])]): Unit = {

val is = new FileInputStream(sourceZip)
val os = new FileOutputStream(destZip)
val bootstrapZip = new ZipInputStream(is)
val outputZip = new ZipOutputStream(os)

for ((ent, data) <- zipEntries(bootstrapZip)) {
val strip = toAdd.map(_._1).toSet

for ((ent, data) <- zipEntries(bootstrapZip) if !strip.contains(ent.getName)) {

// Same workaround as https://github.com/spring-projects/spring-boot/issues/13720
// (https://github.com/spring-projects/spring-boot/commit/a50646b7cc3ad941e748dfb450077e3a73706205#diff-2ff64cd06c0b25857e3e0dfdb6733174R144)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-proguard" % "0.4.0")

libraryDependencies += "com.eed3si9n.jarjarabrams" %% "jarjar-abrams-core" % "1.8.0"
libraryDependencies += "com.eed3si9n.jarjarabrams" %% "jarjar-abrams-core" % "1.8.1"