Skip to content

Commit f749c45

Browse files
committed
update sbt-assembly to the latest, specify scalaVersion in betterzip
1 parent c3bda47 commit f749c45

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import com.earldouglas.xsbtwebplugin._
2929
import WebappPlugin._
3030
import Distributor.{ Keys => DistribKeys, distribSettings }
3131
import sbtassembly.AssemblyPlugin._
32-
import sbtassembly.AssemblyKeys._
32+
import sbtassembly.AssemblyPlugin.autoImport._
3333

3434
object BuildDef extends Build with VersionSystem {
3535

project/Distributor.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import com.earldouglas.xsbtwebplugin.PluginKeys._
2626
import sbt.classpath.ClasspathUtilities
2727
import Project.Initialize
2828

29-
import sbtassembly.AssemblyKeys.assembly
29+
import sbtassembly.AssemblyPlugin.autoImport.assembly
3030

3131
import java.nio.file.{ Files, StandardCopyOption }
3232

project/plugins.sbt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
// webplugin
22
addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "0.9.0")
33

4-
// sbt-eclipse
5-
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.5.0")
4+
//eclipse plugin
5+
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
66

77
//IntelliJ IDEA plugin
88
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
99

1010
//sbt-dependency-graph
1111
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
1212

13-
// sbt-assembly
14-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.12.0")
13+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.0")

project/sbt-betterzip/sbt-betterzip.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ organization := "com.secdec"
44

55
version := "0.1"
66

7+
scalaVersion := "2.10.4"
8+
79
sbtPlugin := true
810

911
libraryDependencies += "org.apache.commons" % "commons-compress" % "1.9"

0 commit comments

Comments
 (0)