Gradle clean up.

6 files changed, 59 insertions, 54 deletions

diff --git a/.gitignore b/.gitignore
index f46b707..70afa7a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -9,14 +9,17 @@
 *.vi
 *~
 *#
-.git/
+.git
 
 # OS ignores.
 .DS_Store
 
 # Editor ignores.
-.ensime*
+*.idea
+*.iml
+*.ipr
+*.iws
 
 # Build ignores.
-.gradle/
-build/
+.gradle
+build
diff --git a/.travis.yml b/.travis.yml
index 94e66ca..d5acc26 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ jdk:
   - openjdk7
   - oraclejdk7
 script:
-  - "gradle check"
+  - "gradle test"
 after_success:
-  - gradle cobertura
-  - gradle coveralls
+  - gradle :stringmetric-core:cobertura :stringmetric-core:coveralls
diff --git a/build.gradle b/build.gradle
index b5eb933..3310a97 100755
--- a/build.gradle
+++ b/build.gradle
@@ -5,32 +5,5 @@ version = '0.25.3'
 ext.scm = 'scm:git@github.com:rockymadden/stringmetric.git'
 ext.url = 'http://rockymadden.com/stringmetric/'
 
-buildscript {
-	dependencies {
-		classpath 'net.coacoas.gradle:gradle-ensime:0.1.8'
-		classpath 'net.saliman:gradle-cobertura-plugin:2.0.0'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:0.1.6'
-	}
-	repositories { mavenCentral() }
-}
-
-subprojects {
-	apply plugin: 'cobertura'
-	apply plugin: 'coveralls'
-	apply plugin: 'ensime'
-	apply plugin: 'scala'
-
-	cobertura.coverageFormats = ['html', 'xml']
-	compileScala { compileScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6', '–Xdisable-assertions'] }
-	compileTestScala { compileTestScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6'] }
-
-	dependencies {
-		compile'org.scala-lang:scala-compiler:2.10.2'
-		compile 'org.scala-lang:scala-library:2.10.2'
-
-		testCompile 'junit:junit:4.11'
-		testCompile 'org.scalatest:scalatest_2.10:2.0.M5b'
-	}
-
-	repositories { mavenCentral() }
-}
+allprojects { apply plugin: 'idea' }
+subprojects { repositories { mavenCentral() } }
diff --git a/cli/build.gradle b/cli/build.gradle
index e2f861c..5ac2369 100755
--- a/cli/build.gradle
+++ b/cli/build.gradle
@@ -1,10 +1,32 @@
-apply from: '../deploy.gradle'
+buildscript {
+	dependencies {
+		classpath 'net.saliman:gradle-cobertura-plugin:2.0.0'
+		classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:0.2.1'
+	}
+	repositories { mavenCentral() }
+}
 
 evaluationDependsOn(':stringmetric-core')
 
+apply from: '../deploy.gradle'
+apply plugin: 'cobertura'
+apply plugin: 'coveralls'
+apply plugin: 'scala'
+
+cobertura.coverageFormats = ['html', 'xml']
+
+compileScala { compileScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6', '–Xdisable-assertions'] }
+compileTestScala { compileTestScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6'] }
+
 dependencies {
 	compile project(':stringmetric-core')
+	compile'org.scala-lang:scala-compiler:2.10.2'
+	compile 'org.scala-lang:scala-library:2.10.2'
+
 	testCompile project(':stringmetric-core').sourceSets.test.output
+	testCompile 'com.google.caliper:caliper:0.5-rc1'
+	testCompile 'junit:junit:4.11'
+	testCompile 'org.scalatest:scalatest_2.10:2.0.M5b'
 }
 
 sourceSets {
@@ -67,7 +89,7 @@ task tar(description: 'Assembles a compressed tar archive of source files.', dep
 			}
 		}
 
-		// Clean up emtpy folder(s) from flatten.
+		// Clean up empty folder(s) from flatten.
 		ant.delete(dir: "${workingPath}/org", includeEmptyDirs: true)
 
 		// Copy project jars into place.
diff --git a/core/build.gradle b/core/build.gradle
index 5c92253..3eec641 100755
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,6 +1,29 @@
+buildscript {
+	dependencies {
+		classpath 'net.saliman:gradle-cobertura-plugin:2.0.0'
+		classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:0.2.1'
+	}
+	repositories { mavenCentral() }
+}
+
 apply from: '../deploy.gradle'
+apply plugin: 'cobertura'
+apply plugin: 'coveralls'
+apply plugin: 'scala'
+
+cobertura.coverageFormats = ['html', 'xml']
 
-dependencies { testCompile 'com.google.caliper:caliper:0.5-rc1' }
+compileScala { compileScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6', '–Xdisable-assertions'] }
+compileTestScala { compileTestScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6'] }
+
+dependencies {
+	compile'org.scala-lang:scala-compiler:2.10.2'
+	compile 'org.scala-lang:scala-library:2.10.2'
+
+	testCompile 'com.google.caliper:caliper:0.5-rc1'
+	testCompile 'junit:junit:4.11'
+	testCompile 'org.scalatest:scalatest_2.10:2.0.M5b'
+}
 
 sourceSets {
 	benchmark {
diff --git a/deploy.gradle b/deploy.gradle
index 35d916a..5c20a5e 100755
--- a/deploy.gradle
+++ b/deploy.gradle
@@ -41,21 +41,6 @@ if (isMavenDeployable) {
 					url "${parent.project.url}"
 					version "${parent.project.version}"
 
-					developers {
-						developer {
-							id 'rockymadden'
-							name 'Rocky Madden'
-						}
-					}
-
-					licenses {
-						license {
-							name 'Apache License v2.0'
-							url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-							distribution 'repo'
-						}
-					}
-
 					scm {
 						url "${parent.project.scm}"
 						connection "${parent.project.scm}"