升级gradle版本，支持V3签名

Tencent · Mar 14, 2019 · daacfb7 · daacfb7
1 parent fef1786
commit daacfb7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'channel'
 buildscript {
     repositories {
         maven {
-            url "file:///Users/leontli/localMaven"
+            url "file:///Users/litao/localMaven"
         }
         google()
         jcenter()
@@ -20,9 +20,8 @@ channel{
 }
 
 rebuildChannel {
-    baseDebugApk = new File(project.projectDir, "baseApk/v1-base-debug.apk")
-    baseReleaseApk = new File(project.projectDir, "baseApk/v2-base-debug.apk")
-    //isFastMode = true
+    baseDebugApk = new File(project.projectDir, "baseApk/app-debug.apk")
+    isFastMode = true
 }
 
 android {
@@ -43,17 +42,13 @@ android {
             storePassword "123456"
             keyAlias "leon"
             keyPassword "123456"
-            v1SigningEnabled true
-            v2SigningEnabled false
         }
 
         debug {
             storeFile file("release.keystore")
             storePassword "123456"
             keyAlias "leon"
             keyPassword "123456"
-            v1SigningEnabled true
-            v2SigningEnabled false
         }
     }
 

diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 ext {
     minSdkVersion = 14
-    compileSdkVersion = 26
+    compileSdkVersion = 28
     targetSdkVersion = compileSdkVersion
-    buildToolsVersion = '26.0.2'
+    buildToolsVersion = '28.0.3'
 
     javaVersion = JavaVersion.VERSION_1_7
 
 
     GROUP = 'com.leon.channel'
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
 
     //POM_PACKAGING = "pom"
     POM_DESCRIPTION = "VasDolly"
@@ -28,13 +28,13 @@ ext {
 buildscript {
     repositories {
         maven {
-            url "file:///Users/leontli/localMaven"
+            url "file:///Users/litao/localMaven"
         }
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
     }
@@ -43,7 +43,7 @@ buildscript {
 allprojects {
     repositories {
         maven {
-            url "file:///Users/leontli/localMaven"
+            url "file:///Users/litao/localMaven"
         }
         google()
         jcenter()

diff --git a/command/jar/VasDolly.jar b/command/jar/VasDolly.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/helper/build.gradle b/helper/build.gradle
@@ -29,9 +29,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':reader')
-    testCompile 'junit:junit:4.12'
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api project(':reader')
+    testImplementation 'junit:junit:4.12'
 }
 
 /**

diff --git a/maven.gradle b/maven.gradle
@@ -48,7 +48,7 @@ install {
     }
 
     repositories.mavenDeployer {
-        repository(url: "file:///Users/leontli/localMaven")
+        repository(url: "file:///Users/litao/localMaven")
     }
 
 //    repositories.mavenDeployer {