Skip to content
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

Updates Ant to 1.10.14, and maven-plugin-api to 3.9.4 #35

Merged
merged 1 commit into from
Sep 8, 2023
Merged

Updates Ant to 1.10.14, and maven-plugin-api to 3.9.4 #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ lazy val jarjar = project
libraryDependencies ++= Seq(
"org.ow2.asm" % "asm" % "9.2",
"org.ow2.asm" % "asm-commons" % "9.2",
"org.apache.ant" % "ant" % "1.9.9",
"org.apache.maven" % "maven-plugin-api" % "3.3.9",
"org.apache.ant" % "ant" % "1.10.14",
"org.apache.maven" % "maven-plugin-api" % "3.9.4",
"org.apache.commons" % "commons-lang3" % "3.8.1",
"junit" % "junit" % "4.12" % "it,test",
"com.github.sbt" % "junit-interface" % "0.13.2" % "it,test"
Expand All @@ -38,13 +38,13 @@ lazy val jarjar = project

IntegrationTest / fork := true
IntegrationTest / envVars := Map(
"JARJAR_CLASSPATH" -> (Runtime / fullClasspath)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L41-47 are formatting changes that weren't applied previously

.value
.map(_.data).mkString(System.getProperty("path.separator"))
"JARJAR_CLASSPATH" -> (Runtime / fullClasspath).value
.map(_.data)
.mkString(System.getProperty("path.separator"))
)

assemblyMergeStrategy := {
case PathList("module-info.class") => MergeStrategy.discard
assemblyMergeStrategy := {
case PathList("module-info.class") => MergeStrategy.discard
case x if x.endsWith("/module-info.class") => MergeStrategy.discard
case x =>
val oldStrategy = (ThisBuild / assemblyMergeStrategy).value
Expand Down