Drop deprecated keys

sbt · Jun 6, 2021 · 81a91ca · 81a91ca
1 parent 28e6ddc
commit 81a91ca
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/src/main/scala/sbtassembly/AssemblyKeys.scala b/src/main/scala/sbtassembly/AssemblyKeys.scala
@@ -11,33 +11,12 @@ trait AssemblyKeys {
   lazy val assembledMappings         = taskKey[Seq[MappingSet]]("Keeps track of jar origins for each source.")
 
   lazy val assemblyPackageScala      = taskKey[File]("Produces the scala artifact.")
-  @deprecated("Use assemblyPackageScala", "0.12.0")
-  lazy val packageScala              = assemblyPackageScala
-
   lazy val assemblyPackageDependency = taskKey[File]("Produces the dependency artifact.")
-  @deprecated("Use assemblyPackageDependency", "0.12.0")
-  lazy val packageDependency         = assemblyPackageDependency
-
   lazy val assemblyJarName           = taskKey[String]("name of the fat jar")
-  @deprecated("Use assemblyJarName", "0.12.0")
-  lazy val jarName                   = assemblyJarName
-
   lazy val assemblyDefaultJarName    = taskKey[String]("default name of the fat jar")
-  @deprecated("Use assemblyDefaultJarName", "0.12.0")
-  lazy val defaultJarName            = assemblyDefaultJarName
-
   lazy val assemblyOutputPath        = taskKey[File]("output path of the fat jar")
-  @deprecated("Use assemblyOutputPath", "0.12.0")
-  lazy val outputPath                = assemblyOutputPath
-
   lazy val assemblyExcludedJars      = taskKey[Classpath]("list of excluded jars")
-  @deprecated("Use assemblyExcludedJars", "0.12.0")
-  lazy val excludedJars              = assemblyExcludedJars
-
   lazy val assemblyMergeStrategy     = settingKey[String => MergeStrategy]("mapping from archive member path to merge strategy")
-  @deprecated("Use assemblyMergeStrategy", "0.12.0")
-  lazy val mergeStrategy             = assemblyMergeStrategy
-
   lazy val assemblyShadeRules        = settingKey[Seq[jarjarabrams.ShadeRule]]("shading rules backed by jarjar")
 }
 object AssemblyKeys extends AssemblyKeys

diff --git a/src/sbt-test/merging/mergefail/build.sbt b/src/sbt-test/merging/mergefail/build.sbt
@@ -1,7 +1,7 @@
 lazy val testmerge = (project in file(".")).
   settings(
     version := "0.1",
-    jarName in assembly := "foo.jar",
+    assemblyJarName in assembly := "foo.jar",
     mergeStrategy in assembly := {
       val old = (mergeStrategy in assembly).value
 

diff --git a/src/sbt-test/merging/mergefail2/build.sbt b/src/sbt-test/merging/mergefail2/build.sbt
@@ -1,5 +1,5 @@
 lazy val testmerge = (project in file(".")).
   settings(
     version := "0.1",
-    jarName in assembly := "foo.jar"
+    assemblyJarName in assembly := "foo.jar"
   )