summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRocky Madden <git@rockymadden.com>2013-02-05 20:23:00 -0700
committerRocky Madden <git@rockymadden.com>2013-02-05 20:23:00 -0700
commit26935aa4483ef678544c07b5fd29543391066479 (patch)
treef56a32164a356d608d39142b37418ae3afdfa22a
parent1fac34409d0e5e6d76afa85ef377fcc11b19ac93 (diff)
downloadstringmetric-26935aa4483ef678544c07b5fd29543391066479.tar.gz
stringmetric-26935aa4483ef678544c07b5fd29543391066479.tar.bz2
stringmetric-26935aa4483ef678544c07b5fd29543391066479.zip
Better backwards compatability with Gradle and Travis.
-rwxr-xr-x.travis.yml3
-rwxr-xr-xbuild.gradle5
-rwxr-xr-xreadme.md2
3 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 45fc71c..359ebb6 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,4 +3,5 @@ scala:
- 2.10.0
jdk:
- openjdk7
- - oraclejdk7 \ No newline at end of file
+ - oraclejdk7
+script: "gradle check"
diff --git a/build.gradle b/build.gradle
index 8c642ca..28fb155 100755
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ allprojects {
subprojects {
apply plugin: 'scala'
-
+
compileScala {
compileScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6', '–Xdisable-assertions']
}
@@ -24,6 +24,9 @@ subprojects {
compile 'org.scala-lang:scala-compiler:2.10.0'
compile 'org.scala-lang:scala-library:2.10.0'
+ scalaTools 'org.scala-lang:scala-compiler:2.10.0'
+ scalaTools 'org.scala-lang:scala-library:2.10.0'
+
testCompile 'junit:junit:4.11'
testCompile 'org.scalatest:scalatest_2.10.0:2.0.M5'
}
diff --git a/readme.md b/readme.md
index f0be2d2..f96eb88 100755
--- a/readme.md
+++ b/readme.md
@@ -348,7 +348,7 @@ tk
## Requirements
* Scala 2.10.x
-* Gradle 1.4+
+* Gradle 1.x
## Versioning
[Semantic Versioning v2.0](http://semver.org/)