Unifiy library versions

Mark Perry · Mark Perry · commit 55b01979cec8 · 2014-06-05T15:06:55.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -46,6 +46,11 @@ allprojects {
         sonatypeReleaseUrl = "$sonatypeBaseUrl/service/local/staging/deploy/maven2/"
         sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl
         primaryEmail = "functionaljava@googlegroups.com"
+
+        dependencySlf4jApi = "org.slf4j:slf4j-api:1.7.5"
+        dependencyJunit = "junit:junit:4.11"
+
+
     }
 	version = fjVersion
 	group = "org.functionaljava"
diff --git a/core/build.gradle b/core/build.gradle
@@ -8,8 +8,8 @@ jar {
 }
 
 dependencies {
-    compile 'org.slf4j:slf4j-api:1.7.5'
-    testCompile "junit:junit:4.11"
+    compile dependencySlf4jApi
+    testCompile dependencyJunit
 }
 
 task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -6,10 +6,6 @@ apply from: "$rootDir/lib.gradle"
 
 mainClassName = "fj.demo.euler.Problem2"
 
-repositories {
-    mavenCentral()
-}
-
 task javadoc(type: Javadoc, overwrite: true) {
     def t = createDynamicJavadoc("$projectDir", ["core"])
     dependsOn(t)
@@ -22,7 +18,7 @@ retrolambda {
 }
 
 dependencies {
-	compile 'org.slf4j:slf4j-api:1.7.5'
+    compile dependencySlf4jApi
 	compile project(":core")
-	testCompile "junit:junit:4.11"
+    testCompile dependencyJunit
 }
diff --git a/java8/build.gradle b/java8/build.gradle
@@ -14,7 +14,7 @@ task javadoc(type: Javadoc, overwrite: true) {
 
 dependencies {
     compile project(":core")
-    testCompile "junit:junit:4.11"
+    testCompile dependencyJunit
 }
 
 compileJava {
diff --git a/tests/build.gradle b/tests/build.gradle
@@ -15,10 +15,10 @@ tasks.withType(ScalaCompile) {
 
 dependencies {
 	compile project(":core")
-    compile "org.slf4j:slf4j-api:1.7.5"
+    compile dependencySlf4jApi
 	compile "org.scala-lang:scala-library:$scalaVersion"
 
 	testCompile "org.scala-lang:scala-library:$scalaVersion"
 	testCompile "org.scalacheck:scalacheck_$scalacheckScalaVersion:$scalacheckVersion"
-    testCompile "junit:junit:4.11"
+    testCompile dependencyJunit
 }

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ jar {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- compile 'org.slf4j:slf4j-api:1.7.5'`
`12`		`- testCompile "junit:junit:4.11"`
	`11`	`+ compile dependencySlf4jApi`
	`12`	`+ testCompile dependencyJunit`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ task javadoc(type: Javadoc, overwrite: true) {`
`14`	`14`
`15`	`15`	`dependencies {`
`16`	`16`	`compile project(":core")`
`17`		`- testCompile "junit:junit:4.11"`
	`17`	`+ testCompile dependencyJunit`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`compileJava {`