diff --git a/build.sbt b/build.sbt index 3dbcd7b..05422f8 100644 --- a/build.sbt +++ b/build.sbt @@ -4,9 +4,9 @@ name := "sbt-cxf-wsdl2java" organization := "com.ebiznext.sbt.plugins" -version := "0.1.5-SNAPSHOT" +version := "0.1.6" -scalaVersion := "2.10.4" +scalaVersion := "2.12.6" publishMavenStyle := true diff --git a/project/build.properties b/project/build.properties index 02cb92b..774565c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=0.13.9 +sbt.version=1.2.0 diff --git a/src/main/scala/com/ebiznext/sbt/plugins/CxfWsdl2JavaPlugin.scala b/src/main/scala/com/ebiznext/sbt/plugins/CxfWsdl2JavaPlugin.scala index 2fbdd4b..18471dc 100644 --- a/src/main/scala/com/ebiznext/sbt/plugins/CxfWsdl2JavaPlugin.scala +++ b/src/main/scala/com/ebiznext/sbt/plugins/CxfWsdl2JavaPlugin.scala @@ -4,6 +4,7 @@ import java.io.File import sbt.Keys._ import sbt._ +import scala.sys.process._ /** * @author stephane.manciot@ebiznext.com @@ -50,9 +51,7 @@ object CxfWsdl2JavaPlugin extends AutoPlugin { managedSourceDirectories in Compile += { (sourceManaged in CxfConfig).value }, - managedClasspath in wsdl2java <<= (classpathTypes in wsdl2java, update).map { (ct, report) => - Classpaths.managedJars(CxfConfig, ct, report) - }, + managedClasspath in wsdl2java := Classpaths.managedJars(CxfConfig, (classpathTypes in wsdl2java).value, update.value), // définition de la tâche wsdl2java wsdl2java := { val s: TaskStreams = streams.value @@ -86,7 +85,7 @@ object CxfWsdl2JavaPlugin extends AutoPlugin { } ((sourceManaged in CxfConfig).value ** "*.java").get }, - sourceGenerators in Compile <+= wsdl2java + sourceGenerators in Compile += wsdl2java ) override lazy val projectSettings =