test

EvgeneOskin · Nov 15, 2015 · 85f37db · 85f37db
1 parent 5809699
commit 85f37db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,4 +5,5 @@ before_install: unset SBT_OPTS JVM_OPTS
 script:
   - make softlint
   - make test
-after_success: "./activator coveralls"
+  - './activator "set unmanagedSourceDirectories in Compile := Seq(file(\".\"))" coverageReport'
+after_success: './activator "set unmanagedSourceDirectories in Compile := Seq(file(\".\"))" coveralls'
diff --git a/Makefile b/Makefile
@@ -9,4 +9,4 @@ softlint:
 
 test:
 	./activator clean coverage test
-	./activator coverageAggregate coverageReport
+	./activator coverageReport
diff --git a/build.sbt b/build.sbt
@@ -19,5 +19,7 @@ resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases"
 // other, legacy style, accesses its actions statically.
 routesGenerator := InjectedRoutesGenerator
 
-resolvers += Classpaths.sbtPluginReleases
+resolvers += Resolver.url("scoverage-bintray", url("https://dl.bintray.com/sksamuel/sbt-plugins/"))(Resolver.ivyStylePatterns)
+
 coverageExcludedPackages := "<empty>;router;.*javascript.*;views.html;"
+