Browse Source

Upgrade to gradle 2.10, enable daemon.

This makes incremental build time ~2.5s on my machine.
pull/99/head
Chris Smith 8 years ago
parent
commit
be8c229031

+ 1
- 1
build.gradle View File

@@ -11,6 +11,6 @@ tasks.dependencies.dependsOn subprojects*.tasks.dependencies
11 11
 
12 12
 task createWrapper(type: Wrapper) {
13 13
     description 'Downloads and installs an up-to-date wrapper for gradle.'
14
-    gradleVersion = '2.4'
14
+    gradleVersion = '2.10'
15 15
 }
16 16
 

+ 1
- 0
gradle.properties View File

@@ -1 +1,2 @@
1 1
 enableClover=false
2
+org.gradle.daemon=true

+ 7
- 14
gradle/local-dependency-change.gradle View File

@@ -3,22 +3,15 @@ gradle.projectsEvaluated {
3 3
     allprojects.each { p -> projectMap[p.name] = p }
4 4
 
5 5
     allprojects.each { p ->
6
-        def replace = []
7
-
8
-        p.configurations.each { conf ->
9
-            def remove = []
10
-            conf.dependencies.each { dep ->
11
-                if (dep.group =~ '^com.dmdirc' && dep.version == '+' && projectMap[dep.name] != null) {
12
-                    remove += dep
13
-                    replace += [conf: conf.name, dep: dep, transitive: dep.transitive]
6
+        p.configurations.all {
7
+            resolutionStrategy.dependencySubstitution.all { DependencySubstitution dependency ->
8
+                if (dependency.requested instanceof ModuleComponentSelector && dependency.requested.group =~ '^com.dmdirc') {
9
+                    def targetProject = projectMap[dependency.requested.module]
10
+                    if (targetProject != null) {
11
+                         dependency.useTarget targetProject
12
+                    }
14 13
                 }
15 14
             }
16
-
17
-            conf.dependencies.removeAll(remove)
18
-        }
19
-
20
-        replace.each { rep ->
21
-            p.dependencies.add(rep.conf, projectMap[rep.dep.name], { transitive rep.transitive })
22 15
         }
23 16
     }
24 17
 }

+ 2
- 2
gradle/wrapper/gradle-wrapper.properties View File

@@ -1,6 +1,6 @@
1
-#Fri Jun 12 22:25:25 BST 2015
1
+#Wed Feb 03 19:23:01 GMT 2016
2 2
 distributionBase=GRADLE_USER_HOME
3 3
 distributionPath=wrapper/dists
4 4
 zipStoreBase=GRADLE_USER_HOME
5 5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip

Loading…
Cancel
Save