浏览代码

Merge pull request #119 from csmith/master

Upgrade gradle.
greboid-patch-1
Chris Smith 6 年前
父节点
当前提交
d79aabe7b5
没有帐户链接到提交者的电子邮件
共有 3 个文件被更改,包括 9 次插入5 次删除
  1. 1
    1
      build.gradle
  2. 6
    2
      gradle/resolve-dependencies.gradle
  3. 2
    2
      gradle/wrapper/gradle-wrapper.properties

+ 1
- 1
build.gradle 查看文件

@@ -12,6 +12,6 @@ tasks.dependencies.dependsOn subprojects*.tasks.dependencies
12 12
 
13 13
 task wrapper(type: Wrapper) {
14 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 查看文件

@@ -2,10 +2,14 @@ task resolveDependencies {
2 2
     doLast {
3 3
         allprojects.each { subProject ->
4 4
             subProject.buildscript.configurations.each { configuration ->
5
-                configuration.resolve()
5
+                if (configuration.isCanBeResolved()) {
6
+	                configuration.resolve()
7
+		}
6 8
             }
7 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 查看文件

@@ -1,6 +1,6 @@
1
-#Thu Oct 27 18:01:10 BST 2016
1
+#Sat Mar 31 12:30:32 BST 2018
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-3.1-bin.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip

正在加载...
取消
保存