升级Gradle版本

meituan · Dec 3, 2018 · d5ad16e · d5ad16e
1 parent a1b31ef
commit d5ad16e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,37 +1,33 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.61'
+    ext.kotlin_version = '1.2.71'
     repositories {
         mavenLocal()
-        mavenCentral()
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
+        maven { url 'https://maven.google.com/' }
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
-//        classpath "com.sankuai.waimai.router:plugin:1.0.42"
+//        classpath "com.sankuai.waimai.router:plugin:1.1.0"
         classpath "com.sankuai.waimai.router:plugin:$VERSION_NAME"
     }
 }
 
 allprojects {
     repositories {
         mavenLocal()
-        mavenCentral()
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
+        maven { url 'https://maven.google.com/' }
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        mavenCentral()
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 POM_NAME=waimai_android_router
 POM_ARTIFACT_ID=router
 POM_PACKAGING=aar
-VERSION_NAME=1.1.0
+VERSION_NAME=1.1.2
 VERSION_CODE=1
 GROUP=com.sankuai.waimai.router
 SUPPORT_VERSION=26.0.2

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 29 13:53:57 CST 2018
+#Mon Dec 03 17:56:56 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 
     compile gradleApi()
     compile localGroovy()
-    compile 'com.android.tools.build:gradle:2.3.3'
+    compile 'com.android.tools.build:gradle:3.2.0'
 
     compile project(':interfaces')
 }

diff --git a/publish b/publish
@@ -13,4 +13,4 @@
 # 5. 验证新版本，把build.gradle改回来
 # 6. git打tag，更新文档(README、CHANGELOG)，github编辑Release信息
 
-./gradlew :interfaces:assemble :router:assemble :compiler:assemble :plugin:assemble :interfaces:bintrayUpload :router:bintrayUpload :compiler:bintrayUpload :plugin:bintrayUpload
+./gradlew clean :interfaces:assemble :router:assemble :compiler:assemble :plugin:assemble :interfaces:bintrayUpload :router:bintrayUpload :compiler:bintrayUpload :plugin:bintrayUpload --stacktrace