Skip to content

update plugin to sbt 1.2 and scala 2.12.6 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pjazdzewski1990 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update plugin to sbt 1.2 and scala 2.12.6 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=0.13.9
sbt.version=1.2.0

7 changes: 3 additions & 4 deletions src/main/scala/com/ebiznext/sbt/plugins/CxfWsdl2JavaPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import java.io.File

import sbt.Keys._
import sbt._
import scala.sys.process._

/**
* @author stephane.manciot@ebiznext.com
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 =
Expand Down