Made tests module compile for scala, disabled scala in core module

mperry · mperry · commit 4a7802fb459e · 2013-12-12T10:19:48.000+10:00
diff --git a/core/build.gradle b/core/build.gradle
@@ -1,24 +1,9 @@
 
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'scala'
 
 defaultTasks 'build'
 
-ext {
-	scalaVersion = "2.10.+"
-	scalacheckVersion = "1.10.+"
-	scalacheckScalaVersion = "2.10"
-}
-
-tasks.withType(ScalaCompile) {
-	scalaCompileOptions.useAnt = false
-}
-
-test {
-	scanForTestClasses = false
-	include '**/*Test.*'
-}
 
 jar {
 	baseName project.projectName
@@ -34,8 +19,6 @@ repositories {
 
 dependencies {
     compile 'org.slf4j:slf4j-api:1.7.5'
-	testCompile "org.scala-lang:scala-library:$scalaVersion"
-	testCompile "org.scalacheck:scalacheck_$scalacheckScalaVersion:$scalacheckVersion"
 
     testCompile "junit:junit:4.11"
 }
diff --git a/tests/build.gradle b/tests/build.gradle
@@ -10,19 +10,39 @@
 // Apply the scala plugin to add support for Scala
 apply plugin: 'scala'
 
+
+ext {
+	scalaVersion = "2.10.+"
+	scalacheckVersion = "1.10.+"
+	scalacheckScalaVersion = "2.10"
+}
+
+
+
+tasks.withType(ScalaCompile) {
+	scalaCompileOptions.useAnt = false
+}
+
+
+test {
+	scanForTestClasses = false
+	include '**/*Test.*'
+}
+
 // In this section you declare where to find the dependencies of your project
 repositories {
     // Use 'maven central' for resolving your dependencies.
     // You can declare any Maven/Ivy/file repository here.
     mavenCentral()
 }
 
-// In this section you declare the dependencies for your production and test code
+
 dependencies {
-    // We use the latest 2.10 scala version in our library project
-    compile 'org.scala-lang:scala-library:2.10.3'
+    compile 'org.slf4j:slf4j-api:1.7.5'
+	compile "org.scala-lang:scala-library:$scalaVersion"
+	testCompile "org.scala-lang:scala-library:$scalaVersion"
+	testCompile "org.scalacheck:scalacheck_$scalacheckScalaVersion:$scalacheckVersion"
 
-    // We use the latest version of the scalatest for testing our library
-    testCompile 'junit:junit:4.11'
-    testCompile 'org.scalatest:scalatest_2.10:1.9.2'
+    testCompile "junit:junit:4.11"
+	testCompile 'org.scalatest:scalatest_2.10:1.9.2'
 }
