兼容Gradle 3.2+

TangXiaoLv · Feb 21, 2017 · cbc40ef · cbc40ef
1 parent ff9d4eb
commit cbc40ef
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 93 deletions.
diff --git a/DexKnifePlugin/app/build.gradle b/DexKnifePlugin/app/build.gradle
@@ -2,18 +2,28 @@ apply plugin: 'com.android.application'
 apply plugin: 'dexknifePlus'
 
 android {
-    compileSdkVersion Integer.parseInt(project.COMPILE_SDK_VER)
-    buildToolsVersion project.BUILD_TOOLS_VER
+    compileSdkVersion 23
+    buildToolsVersion '23.0.3'
 
     defaultConfig {
-        minSdkVersion Integer.parseInt(project.MIN_SDK_VER)
-        targetSdkVersion Integer.parseInt(project.TARGET_SDK_VERSION)
+        minSdkVersion 14
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
 
         multiDexEnabled true
     }
 
+    //签名
+    signingConfigs {
+        key {
+            storeFile file('mutidex.jks')
+            storePassword '123456'
+            keyAlias 'king'
+            keyPassword '123456'
+        }
+    }
+
     productFlavors{
         dev{
 
@@ -26,12 +36,13 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            signingConfig signingConfigs.key
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
 
         debug {
-//            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -48,7 +59,7 @@ dexKnife{
     //1.如果没有可选参数，将根据enabled决定是否分包。
     //2.如果有可选参数，需满足必选参数和可选参数的条件才允许分包
     productFlavor 'mock'
-    buildType 'debug'
+    //buildType 'debug'
 
     /*
     *eg:当前productFlavors = dev，buildType = debug，

diff --git a/DexKnifePlugin/app/mutidex.jks b/DexKnifePlugin/app/mutidex.jks
diff --git a/DexKnifePlugin/app/src/main/res/values/strings.xml b/DexKnifePlugin/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">demo</string>
+    <string name="app_name">MultiDexPluginApp</string>
 
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>

diff --git a/DexKnifePlugin/build.gradle b/DexKnifePlugin/build.gradle
@@ -1,12 +1,13 @@
 buildscript {
     repositories {
+        //maven { url uri('./repo') }
         jcenter()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
-        classpath 'com.library.tangxiaolv:dexknife-plus:1.0.1'
+        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.library.tangxiaolv:dexknife-plus:1.0.3'
     }
 }
 

diff --git a/DexKnifePlugin/dexknife-plus/gradle.properties b/DexKnifePlugin/dexknife-plus/gradle.properties
@@ -1,6 +1,6 @@
 #Gradle:groupId:libraryName:publicVersion
 LOCAL_VERSION=0.0.5
-PUBLIC_VERSION=1.0.1
+PUBLIC_VERSION=1.0.3
 GROUP_ID=com.library.tangxiaolv
 #±ØÐë¸úModelÃûÒ»Ñù
 LIBRARY_NAME=dexknife-plus