Skip to content

Commit

Permalink
Update sbt-multi-jvm & sbt-assembly (#193)
Browse files Browse the repository at this point in the history
* Update sbt-multi-jvm & sbt-assembly

* fix group id

* use assemblyOutputPath rather than target

* discard assemblyOutputPath depend

* fix path

* avoid sbt task cyclic depend

* fix launcher

* fix bundler jar loading
  • Loading branch information
Roiocam committed Apr 29, 2024
1 parent eb17147 commit b7bd1ed
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ lazy val cassandraLauncher = project
.disablePlugins(MimaPlugin)
.settings(
name := "pekko-persistence-cassandra-launcher",
Compile / managedResourceDirectories += (cassandraBundle / target).value / "bundle",
Compile / managedResourceDirectories += (cassandraBundle / target).value,
Compile / managedResources += (cassandraBundle / Compile / packageBin).value)

// This project doesn't get published directly, rather the assembled artifact is included as part of cassandraLaunchers
Expand All @@ -61,7 +61,6 @@ lazy val cassandraBundle = project
libraryDependencies += ("org.apache.cassandra" % "cassandra-all" % "3.11.3")
.exclude("commons-logging", "commons-logging"),
dependencyOverrides += "com.github.jbellis" % "jamm" % "0.3.3", // See jamm comment in https://issues.apache.org/jira/browse/CASSANDRA-9608
assembly / target := target.value / "bundle" / "pekko" / "persistence" / "cassandra" / "launcher",
assembly / assemblyJarName := "cassandra-bundle.jar",
Compile / packageBin := Def.taskDyn {
val store = streams.value.cacheStoreFactory.make("shaded-output")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ object CassandraLauncher {
new File(cassandraDirectory, "cassandra-bundle.jar")
if (!cassandraBundleFile.exists()) {
val is =
this.getClass.getClassLoader.getResourceAsStream("pekko/persistence/cassandra/launcher/cassandra-bundle.jar")
this.getClass.getClassLoader.getResourceAsStream("cassandra-bundle.jar")
try {
Files.copy(is, cassandraBundleFile.toPath)
} finally {
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
addSbtPlugin("com.github.sbt" % "sbt-multi-jvm" % "0.6.0")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.3")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.12")
Expand Down

0 comments on commit b7bd1ed

Please sign in to comment.