Make gradle parallel builds work

billoneil · billoneil · commit 1552911d68dc · 2018-07-05T08:08:59.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     // buildscript dependencies can be used for build time plugins.
     dependencies {
-        classpath "com.github.jengelman.gradle.plugins:shadow:1.2.3"
+        classpath "com.github.jengelman.gradle.plugins:shadow:2.0.4"
     }
 }
 
@@ -34,7 +34,7 @@ allprojects {
         }
     }
 
-    repositories { 
+    repositories {
         mavenLocal()
         mavenCentral()
         maven { url 'https://jitpack.io' } // This allows us to use jitpack projects
@@ -51,7 +51,7 @@ allprojects {
             force('io.reactivex:rxjava:1.1.2')
             force('com.google.code.gson:gson:2.6.2')
             force('commons-logging:commons-logging:1.2')
-            
+
             // cache dynamic versions for 10 minutes
             cacheDynamicVersionsFor 10*60, 'seconds'
             // don't cache changing modules at all
@@ -77,12 +77,4 @@ allprojects {
     }
     // Maven Publish End
 }
-
-subprojects {
-    apply plugin: 'com.github.johnrengelman.shadow'
-
-    shadowJar {
-       classifier = null
-    }
-}
 // {{end:build}}
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-org.gradle.configureondemand=true
-//org.gradle.parallel=true
+//org.gradle.configureondemand=true
+org.gradle.parallel=true
diff --git a/stubbornjava-webapp/build.gradle b/stubbornjava-webapp/build.gradle
@@ -1,4 +1,6 @@
 // {{start:dependencies}}
+apply plugin: 'com.github.johnrengelman.shadow'
+
 dependencies {
     // Project reference
     compile project(':stubbornjava-undertow')

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`	`// buildscript dependencies can be used for build time plugins.`
`7`	`7`	`dependencies {`
`8`		`- classpath "com.github.jengelman.gradle.plugins:shadow:1.2.3"`
	`8`	`+ classpath "com.github.jengelman.gradle.plugins:shadow:2.0.4"`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`@@ -34,7 +34,7 @@ allprojects {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`- repositories {`
	`37`	`+ repositories {`
`38`	`38`	`mavenLocal()`
`39`	`39`	`mavenCentral()`
`40`	`40`	`maven { url 'https://jitpack.io' } // This allows us to use jitpack projects`
`@@ -51,7 +51,7 @@ allprojects {`
`51`	`51`	`force('io.reactivex:rxjava:1.1.2')`
`52`	`52`	`force('com.google.code.gson:gson:2.6.2')`
`53`	`53`	`force('commons-logging:commons-logging:1.2')`
`54`		`-`
	`54`	`+`
`55`	`55`	`// cache dynamic versions for 10 minutes`
`56`	`56`	`cacheDynamicVersionsFor 10*60, 'seconds'`
`57`	`57`	`// don't cache changing modules at all`
`@@ -77,12 +77,4 @@ allprojects {`
`77`	`77`	`}`
`78`	`78`	`// Maven Publish End`
`79`	`79`	`}`
`80`		`-`
`81`		`-subprojects {`
`82`		`- apply plugin: 'com.github.johnrengelman.shadow'`
`83`		`-`
`84`		`- shadowJar {`
`85`		`- classifier = null`
`86`		`- }`
`87`		`-}`
`88`	`80`	`// {{end:build}}`