Przeglądaj źródła

Merge pull request #119 from csmith/master

Upgrade gradle.
greboid-patch-1
Chris Smith 6 lat temu
rodzic
commit
d79aabe7b5
No account linked to committer's email address

+ 1
- 1
build.gradle Wyświetl plik

12
 
12
 
13
 task wrapper(type: Wrapper) {
13
 task wrapper(type: Wrapper) {
14
     description 'Downloads and installs an up-to-date wrapper for gradle.'
14
     description 'Downloads and installs an up-to-date wrapper for gradle.'
15
-    gradleVersion = '3.1'
15
+    gradleVersion = '4.6'
16
 }
16
 }
17
 
17
 

+ 6
- 2
gradle/resolve-dependencies.gradle Wyświetl plik

2
     doLast {
2
     doLast {
3
         allprojects.each { subProject ->
3
         allprojects.each { subProject ->
4
             subProject.buildscript.configurations.each { configuration ->
4
             subProject.buildscript.configurations.each { configuration ->
5
-                configuration.resolve()
5
+                if (configuration.isCanBeResolved()) {
6
+	                configuration.resolve()
7
+		}
6
             }
8
             }
7
             subProject.configurations.each { configuration ->
9
             subProject.configurations.each { configuration ->
8
-                configuration.resolve()
10
+		if (configuration.isCanBeResolved()) {
11
+	                configuration.resolve()
12
+		}
9
             }
13
             }
10
         }
14
         }
11
     }
15
     }

+ 2
- 2
gradle/wrapper/gradle-wrapper.properties Wyświetl plik

1
-#Thu Oct 27 18:01:10 BST 2016
1
+#Sat Mar 31 12:30:32 BST 2018
2
 distributionBase=GRADLE_USER_HOME
2
 distributionBase=GRADLE_USER_HOME
3
 distributionPath=wrapper/dists
3
 distributionPath=wrapper/dists
4
 zipStoreBase=GRADLE_USER_HOME
4
 zipStoreBase=GRADLE_USER_HOME
5
 zipStorePath=wrapper/dists
5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip

Ładowanie…
Anuluj
Zapisz