Gradle clean up and moved to ensime.

5 files changed, 81 insertions, 157 deletions

diff --git a/.gitignore b/.gitignore
index 8f0fd62..3ea21e3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -15,12 +15,8 @@
 .DS_Store
 
 # Editor ignores.
-*.ids
-*.iml
-*.ipr
-*.iws
-.idea/
-out/
+.ensime
 
 # Build ignores.
+.gradle/
 build/
diff --git a/build.gradle b/build.gradle
index 5d1dfbe..ba67f8a 100755
--- a/build.gradle
+++ b/build.gradle
@@ -5,33 +5,25 @@ version = '0.25.3'
 ext.scm = 'scm:git@github.com:rockymadden/stringmetric.git'
 ext.url = 'http://rockymadden.com/stringmetric/'
 
-allprojects {
-	apply plugin: 'idea'
+buildscript {
+	dependencies { classpath 'net.coacoas.gradle:gradle-ensime:0.1.8' }
+	repositories { mavenCentral() }
 }
 
 subprojects {
+	apply plugin: 'ensime'
 	apply plugin: 'scala'
 
-	compileScala {
-		compileScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6', '–Xdisable-assertions']
-	}
-
-	compileTestScala {
-		compileTestScala.scalaCompileOptions.additionalParameters = ['-target:jvm-1.6']
-	}
+	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.1'
 		compile 'org.scala-lang:scala-library:2.10.1'
 
-		scalaTools 'org.scala-lang:scala-compiler:2.10.1'
-		scalaTools 'org.scala-lang:scala-library:2.10.1'
-
 		testCompile 'junit:junit:4.11'
 		testCompile 'org.scalatest:scalatest_2.10:2.0.M5b'
 	}
 
-	repositories {
-		mavenCentral()
-	}
+	repositories { mavenCentral() }
 }
diff --git a/maven.gradle b/maven.gradle
new file mode 100755
index 0000000..8c79e1c
--- /dev/null
+++ b/maven.gradle
@@ -0,0 +1,69 @@
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+def isMavenDeployable = hasProperty('mavenRepositoryUrl') &&
+	hasProperty('mavenRepositoryUsername') &&
+	hasProperty('mavenRepositoryPassword')
+
+if (isMavenDeployable) {
+	signing {
+		sign configurations.archives
+	}
+
+	task scaladocJar(type: Jar, dependsOn: scaladoc) {
+		classifier = 'javadoc'
+		from "${project.buildDir}/docs/scaladoc"
+	}
+
+	task sourceJar(type: Jar, dependsOn: classes) {
+		classifier = 'sources'
+		from sourceSets.main.allSource
+	}
+
+	artifacts {
+		archives jar
+		archives scaladocJar
+		archives sourceJar
+	}
+
+	uploadArchives {
+		repositories {
+			mavenDeployer {
+				beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+				repository(url: mavenRepositoryUrl) {
+					authentication(userName: mavenRepositoryUsername, password: mavenRepositoryPassword)
+				}
+
+				pom.project {
+					description "${parent.project.description}"
+					groupId "${parent.project.group}"
+					name "${project.name}"
+					packaging 'jar'
+					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}"
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/stringmetric-cli/build.gradle b/stringmetric-cli/build.gradle
index c0d1b89..e6d41bc 100755
--- a/stringmetric-cli/build.gradle
+++ b/stringmetric-cli/build.gradle
@@ -1,13 +1,9 @@
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-def isMavenDeployable = hasProperty('mavenRepositoryUrl') && hasProperty('mavenRepositoryUsername') && hasProperty('mavenRepositoryPassword')
+apply from: '../maven.gradle'
 
 evaluationDependsOn(':stringmetric-core')
 
 dependencies {
 	compile project(':stringmetric-core')
-
 	testCompile project(':stringmetric-core').sourceSets.test.output
 }
 
@@ -50,7 +46,7 @@ task tar(description: 'Assembles a compressed tar archive of source files.', dep
 	outputs.upToDateWhen {
 		new File(workingPath).isDirectory()
 	}
-	
+
 	doLast {
 		// Clean up working directory and tar from last execution, should they exist.
 		ant.delete(dir: workingPath, failOnError: false)
@@ -102,66 +98,3 @@ task tar(description: 'Assembles a compressed tar archive of source files.', dep
 		}
 	}
 }
-
-if (isMavenDeployable) {
-	signing {
-		sign configurations.archives
-	}
-
-	task scaladocJar(type: Jar, dependsOn: scaladoc) {
-		classifier = 'javadoc'
-		from "${project.buildDir}/docs/scaladoc"
-	}
-
-	task sourceJar(type: Jar, dependsOn: classes) {
-		classifier = 'sources'
-		from sourceSets.main.allSource
-	}
-
-	artifacts {
-		archives jar
-		archives scaladocJar
-		archives sourceJar
-	}
-
-	uploadArchives {
-		repositories {
-			mavenDeployer {
-				beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-				repository(url: mavenRepositoryUrl) {
-					authentication(userName: mavenRepositoryUsername, password: mavenRepositoryPassword)
-				}
-
-				pom.project {
-					description "${parent.project.description}"
-					groupId "${parent.project.group}"
-					name "${project.name}"
-					packaging 'jar'
-					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}"
-					}
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/stringmetric-core/build.gradle b/stringmetric-core/build.gradle
index 312e6c0..127d014 100755
--- a/stringmetric-core/build.gradle
+++ b/stringmetric-core/build.gradle
@@ -1,7 +1,4 @@
-apply plugin: 'maven'
-apply plugin: 'signing'
-
-def isMavenDeployable = hasProperty('mavenRepositoryUrl') && hasProperty('mavenRepositoryUsername') && hasProperty('mavenRepositoryPassword')
+apply from: '../maven.gradle'
 
 dependencies {
 	testCompile 'com.google.caliper:caliper:0.5-rc1'
@@ -48,66 +45,3 @@ sourceSets {
 		}
 	}
 }
-
-if (isMavenDeployable) {
-	signing {
-		sign configurations.archives
-	}
-
-	task scaladocJar(type: Jar, dependsOn: scaladoc) {
-		classifier = 'javadoc'
-		from "${project.buildDir}/docs/scaladoc"
-	}
-
-	task sourceJar(type: Jar, dependsOn: classes) {
-		classifier = 'sources'
-		from sourceSets.main.allSource
-	}
-
-	artifacts {
-		archives jar
-		archives scaladocJar
-		archives sourceJar
-	}
-
-	uploadArchives {
-		repositories {
-			mavenDeployer {
-				beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-				repository(url: mavenRepositoryUrl) {
-					authentication(userName: mavenRepositoryUsername, password: mavenRepositoryPassword)
-				}
-
-				pom.project {
-					description "${parent.project.description}"
-					groupId "${parent.project.group}"
-					name "${project.name}"
-					packaging 'jar'
-					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}"
-					}
-				}
-			}
-		}
-	}
-}
\ No newline at end of file