Skip to content

Commit

Permalink
Merge pull request playframework#588 from xuwei-k/patch-1
Browse files Browse the repository at this point in the history
fix warnings in build.sbt
  • Loading branch information
mkurz authored Jul 15, 2021
2 parents 6cbb5c2 + b27f54b commit 8b8133d
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,8 @@ lazy val shadedCommonSettings = Seq(
)

lazy val shadeAssemblySettings = commonSettings ++ shadedCommonSettings ++ Seq(
assembly / assemblyOption ~= (_.copy(includeScala = false)),
assembly / assemblyOption ~= (_.withIncludeScala(false)),
assembly / test := {},
assembly / assemblyOption ~= {
_.copy(includeScala = false)
},
assembly / assemblyJarName := {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((epoch, major)) =>
Expand Down Expand Up @@ -220,7 +217,7 @@ lazy val `shaded-asynchttpclient` = project
//ivyXML := <dependencies></dependencies>,
//ivyLoggingLevel := UpdateLogging.Full,
//logLevel := Level.Debug,
assembly / assemblyOption := (assembly / assemblyOption).value.copy(includeBin = false, includeScala = false),
assembly / assemblyOption := (assembly / assemblyOption).value.withIncludeBin(false).withIncludeScala(false),
Compile / packageBin := assembly.value
)

Expand All @@ -245,7 +242,7 @@ lazy val `shaded-oauth` = project
// https://stackoverflow.com/questions/24807875/how-to-remove-projectdependencies-from-pom
// Remove dependencies from the POM because we have a FAT jar here.
makePomConfiguration := makePomConfiguration.value.withProcess(process = dependenciesFilter),
assembly / assemblyOption := (assembly / assemblyOption).value.copy(includeBin = false, includeScala = false),
assembly / assemblyOption := (assembly / assemblyOption).value.withIncludeBin(false).withIncludeScala(false),
Compile / packageBin := assembly.value
)

Expand Down

0 comments on commit 8b8133d

Please sign in to comment.