Skip to content

Commit e006319

Browse files
authored
fix: require bash script plugin when packaging (#29)
1 parent 1711947 commit e006319

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*
2+
* Copyright © 2016-2023 Lightbend, Inc. <http://www.lightbend.com>
3+
*/
4+
5+
package com.lightbend.sbt.javaagent
6+
7+
object Dependencies {
8+
// no bash script plugin dependency for sbt 0.13
9+
val BashStartScriptPlugin = "sbt.plugins.JvmPlugin"
10+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* Copyright © 2016-2023 Lightbend, Inc. <http://www.lightbend.com>
3+
*/
4+
5+
package com.lightbend.sbt.javaagent
6+
7+
object Dependencies {
8+
val BashStartScriptPlugin = "com.typesafe.sbt.packager.archetypes.scripts.BashStartScriptPlugin"
9+
}

src/main/scala/com/lightbend/sbt/javaagent/JavaAgentPackaging.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ object JavaAgentPackaging extends AutoPlugin {
1717

1818
override def trigger = allRequirements
1919

20-
override def requires = JavaAgent && PluginRef("com.typesafe.sbt.packager.archetypes.JavaAppPackaging")
20+
override def requires = JavaAgent &&
21+
PluginRef("com.typesafe.sbt.packager.archetypes.JavaAppPackaging") &&
22+
PluginRef(Dependencies.BashStartScriptPlugin)
2123

2224
override def projectSettings = {
2325
import com.typesafe.sbt.packager.{ Keys => PackagerKeys }

0 commit comments

Comments
 (0)