Repository: incubator-wave Updated Branches: refs/heads/feature/WAVE-426-add-sbt 09370f4f8 -> d9cfad3e5
Adds tests source folders. Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/d9cfad3e Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/d9cfad3e Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/d9cfad3e Branch: refs/heads/feature/WAVE-426-add-sbt Commit: d9cfad3e596b4310b90932a083212061ec6eaa59 Parents: 09370f4 Author: Yuri Zelikov <[email protected]> Authored: Tue May 26 06:26:10 2015 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Tue May 26 06:26:10 2015 +0300 ---------------------------------------------------------------------- build.sbt | 25 +++++++------------------ build.xml | 6 +++--- 2 files changed, 10 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d9cfad3e/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index ab925bb..3921cb5 100644 --- a/build.sbt +++ b/build.sbt @@ -8,6 +8,12 @@ version := "0.1.0" javaSource in Compile := baseDirectory.value / "src" +javaSource in Test := baseDirectory.value / "test" + +//includeFilter in Test := "*Test" + +//excludeFilter in Test := "**/*GwtTest" || "**/*LargeTest" || "**/server/persistence/**" + unmanagedSourceDirectories in Compile += baseDirectory.value / "proto_src" unmanagedSourceDirectories in Compile += baseDirectory.value / "gen" / "gxp" @@ -16,30 +22,13 @@ unmanagedSourceDirectories in Compile += baseDirectory.value / "gen" / "messages unmanagedSourceDirectories in Compile += baseDirectory.value / "gen" / "messages" -//managedSourceDirectories in Compile <<=(javaSource in Compile) (base => base / "proto_src" :: Nil) - -//javaSource in Test := baseDirectory.value / "test" - -//unmanagedBase := baseDirectory.value / "third_party" / "runtime" - -//unmanagedJars in Compile ++= { -// val base = baseDirectory.value -// val baseDirectories = (base / "thirparty" / "runtime") -// val customJars = (baseDirectories ** "*.jar") -// customJars.classpath -//} unmanagedJars in Compile := (baseDirectory.value / "third_party" / "runtime" ** "*.jar").classpath unmanagedJars in Compile ++= (baseDirectory.value / "third_party" / "test" ** "*.jar").classpath -//unmanagedJars in Test := (baseDirectory.value / "third_party" / "test" ** "*.jar").classpath - -libraryDependencies += "com.google.gwt" % "gwt-user" % "2.7.0" - -libraryDependencies += "com.google.gwt" % "gwt-dev" % "2.7.0" +unmanagedJars in Compile ++= (baseDirectory.value / "third_party" / "codegen" ** "*.jar").classpath -libraryDependencies += "com.google.gwt" % "gwt-codeserver" % "2.7.0" libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d9cfad3e/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 0bcebee..eaedda6 100644 --- a/build.xml +++ b/build.xml @@ -947,9 +947,9 @@ <target name="get-third-party-codegen" description="Download code generating third party dependencies"> <get dest="${lib.codegen}" usetimestamp="true" skipexisting="true"> <url url="http://www.antlr3.org/download/antlr-3.2.jar"; /> - <url url="http://central.maven.org/maven2/com/google/gwt/gwt-dev/2.6.1/gwt-dev-2.6.1.jar"; /> - <url url="http://central.maven.org/maven2/com/google/gwt/gwt-user/2.6.1/gwt-user-2.6.1.jar"; /> - <url url="http://central.maven.org/maven2/com/google/gwt/gwt-codeserver/2.6.1/gwt-codeserver-2.6.1.jar"; /> + <url url="http://central.maven.org/maven2/com/google/gwt/gwt-dev/2.7.0/gwt-dev-2.7.0.jar"; /> + <url url="http://central.maven.org/maven2/com/google/gwt/gwt-user/2.7.0/gwt-user-2.7.0.jar"; /> + <url url="http://central.maven.org/maven2/com/google/gwt/gwt-codeserver/2.7.0/gwt-codeserver-2.7.0.jar"; /> <url url="http://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar"; /> <url url="http://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar"; /> <url url="https://archive.apache.org/dist/velocity/engine/1.6.3/velocity-1.6.3.jar"; />
