Tidy up gradle scripts

Mark Perry · Mark Perry · commit 5444dfaf655d · 2014-06-05T15:12:25.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,6 @@ Boolean doSigning() {
     signingEnabled.trim() == "true"
 }
 
-
 ext {
 }
 
@@ -19,10 +18,8 @@ if (JavaVersion.current().isJava8Compatible()) {
     }
 }
 
-
 allprojects {
 
-
 	ext {
         isSnapshot = true
         fjBaseVersion = "4.2"
@@ -49,9 +46,8 @@ allprojects {
 
         dependencySlf4jApi = "org.slf4j:slf4j-api:1.7.5"
         dependencyJunit = "junit:junit:4.11"
-
-
     }
+
 	version = fjVersion
 	group = "org.functionaljava"
 }
@@ -74,7 +70,6 @@ subprojects {
         mavenCentral()
     }
 
-
     apply plugin: "maven"
     apply plugin: "java"
 
@@ -108,7 +103,6 @@ subprojects {
         }
     }
 
-
     uploadArchives {
         enabled = false
         repositories {
@@ -133,8 +127,6 @@ subprojects {
                         }
                         scm {
                             url scmUrl
-//                        connection scmGitFile
-//                        developerConnection scmGitFile
                         }
                         licenses {
                             license {
diff --git a/consume/build.gradle b/consume/build.gradle
@@ -6,5 +6,5 @@ repositories {
 }
 
 dependencies {
-    compile("org.functionaljava:functionaljava:$fjConsumeVersion")
+    compile("$group:$projectName:$fjConsumeVersion")
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ Boolean doSigning() {`
`7`	`7`	`signingEnabled.trim() == "true"`
`8`	`8`	`}`
`9`	`9`
`10`		`-`
`11`	`10`	`ext {`
`12`	`11`	`}`
`13`	`12`
`@@ -19,10 +18,8 @@ if (JavaVersion.current().isJava8Compatible()) {`
`19`	`18`	`}`
`20`	`19`	`}`
`21`	`20`
`22`		`-`
`23`	`21`	`allprojects {`
`24`	`22`
`25`		`-`
`26`	`23`	`ext {`
`27`	`24`	`isSnapshot = true`
`28`	`25`	`fjBaseVersion = "4.2"`
`@@ -49,9 +46,8 @@ allprojects {`
`49`	`46`
`50`	`47`	`dependencySlf4jApi = "org.slf4j:slf4j-api:1.7.5"`
`51`	`48`	`dependencyJunit = "junit:junit:4.11"`
`52`		`-`
`53`		`-`
`54`	`49`	`}`
	`50`	`+`
`55`	`51`	`version = fjVersion`
`56`	`52`	`group = "org.functionaljava"`
`57`	`53`	`}`
`@@ -74,7 +70,6 @@ subprojects {`
`74`	`70`	`mavenCentral()`
`75`	`71`	`}`
`76`	`72`
`77`		`-`
`78`	`73`	`apply plugin: "maven"`
`79`	`74`	`apply plugin: "java"`
`80`	`75`
`@@ -108,7 +103,6 @@ subprojects {`
`108`	`103`	`}`
`109`	`104`	`}`
`110`	`105`
`111`		`-`
`112`	`106`	`uploadArchives {`
`113`	`107`	`enabled = false`
`114`	`108`	`repositories {`
`@@ -133,8 +127,6 @@ subprojects {`
`133`	`127`	`}`
`134`	`128`	`scm {`
`135`	`129`	`url scmUrl`
`136`		`-// connection scmGitFile`
`137`		`-// developerConnection scmGitFile`
`138`	`130`	`}`
`139`	`131`	`licenses {`
`140`	`132`	`license {`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ repositories {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- compile("org.functionaljava:functionaljava:$fjConsumeVersion")`
	`9`	`+ compile("$group:$projectName:$fjConsumeVersion")`
`10`	`10`	`}`