修复一些已知问题

Author: tangxiaolv

DexKnifePlugin/README.md

@@ -1,3 +1,3 @@
 /build
-
+maindexlist.txt
 *.iml

DexKnifePlugin/app/.gitignore

@@ -37,7 +37,4 @@ dependencies {
     compile "io.reactivex:rxjava:${RX_JAVA}"
     compile "io.reactivex:rxandroid:${RX_ANDROID}"
     compile 'com.android.support:multidex:1.0.1'
-}
-
-// 要放到第二个dex中的包名前缀 second_dex_package_list.txt
-// Set the prefix of package's path in second_dex_package_list.txt
+}

DexKnifePlugin/app/build.gradle

@@ -6,8 +6,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-        classpath 'com.ceabie.dextools:gradle-dexknife-plugin:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.ceabie.dextools:gradle-dexknife-plugin:2.0.1'
     }
 }
 

DexKnifePlugin/build.gradle

@@ -40,7 +40,7 @@ uploadArchives {
     repositories {
         mavenDeployer {
             repository(url: uri('../repo'))
-            pom.version = "2.0.0"
+            pom.version = "2.0.1"
             pom.artifactId = "gradle-dexknife-plugin"
             pom.groupId = "com.ceabie.dextools"
         }

DexKnifePlugin/gradle-dexknife-plugin/build.gradle

@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2016 ceabie (https://github.com/ceabie/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.ceabie.dexknife;
 
 import org.gradle.api.file.FileTreeElement;

DexKnifePlugin/gradle-dexknife-plugin/src/main/groovy/com/ceabie/dexknife/ClassFileTreeElement.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2016 ceabie (https://github.com/ceabie/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.ceabie.dexknife;
 
 import org.gradle.api.tasks.util.PatternSet;

DexKnifePlugin/gradle-dexknife-plugin/src/main/groovy/com/ceabie/dexknife/DexKnifeConfig.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2016 ceabie (https://github.com/ceabie/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.ceabie.dexknife
 
 import org.gradle.api.Plugin
@@ -53,14 +68,15 @@ public class DexKnifePlugin implements Plugin<Project> {
             for (variant in project.android.applicationVariants) {
                 if (isMultiDexEnabled(variant)) {
                     if (SplitToolsFor130.isCompat(variant)) {
+                        System.err.println("DexKnife: Compat 1.3.0.");
                         SplitToolsFor130.processSplitDex(project, variant)
                     } else if (SplitToolsFor150.isCompat()) {
                         SplitToolsFor150.processSplitDex(project, variant)
                     } else {
-                        println("DexKnife Error: Android gradle plugin only < 2.0.0.");
+                        System.err.println("DexKnife Error: DexKnife is not compatible your Android gradle plugin.");
                     }
                 } else {
-                    println("DexKnife : MultiDexEnabled is false, it's not work.");
+                    System.err.println("DexKnife : MultiDexEnabled is false, it's not work.");
                 }
             }
         }

DexKnifePlugin/gradle-dexknife-plugin/src/main/groovy/com/ceabie/dexknife/DexKnifePlugin.groovy

@@ -1,7 +1,20 @@
+/*
+ * Copyright (C) 2016 ceabie (https://github.com/ceabie/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.ceabie.dexknife;
 
-import com.android.builder.Version;
-
 import org.gradle.api.Project;
 import org.gradle.api.file.FileTreeElement;
 import org.gradle.api.specs.Spec;
@@ -71,28 +84,15 @@ protected static void endDexKnife() {
         System.out.println("DexKnife Finished: " + time);
     }
 
-    static int getAndroidPluginVersion() {
-        String version = Version.ANDROID_GRADLE_PLUGIN_VERSION;
-        int size = version.length();
-        int ver = 0;
-        for (int i = 0; i < size; i++) {
-            char c = version.charAt(i);
-            if (Character.isDigit(c) || c == '.') {
-                if (c != '.') {
-                    ver = ver * 10 + c - '0';
-                }
-            } else {
-                break;
-            }
-        }
-
-        return ver;
-    }
-
     public static boolean processMainDexList(Project project, boolean minifyEnabled, File mappingFile,
                                              File jarMergingOutputFile, File andMainDexList,
                                              DexKnifeConfig dexKnifeConfig) throws Exception {
 
+        if (!minifyEnabled && jarMergingOutputFile == null) {
+            System.out.println("DexKnife Error: jarMerging is Null! Skip DexKnife. Please report All Gradle Log.");
+            return false;
+        }
+
         return genMainDexList(project, minifyEnabled, mappingFile, jarMergingOutputFile,
                 andMainDexList, dexKnifeConfig);
     }
@@ -171,7 +171,7 @@ protected static DexKnifeConfig getDexKnifeConfig(Project project) throws Except
             getMaindexSpec(dexKnifeConfig.patternSet);
         } else {
             dexKnifeConfig.useSuggest = true;
-            System.err.println("DexKnife Warnning: NO SET split Or keep path, it will use Suggest!");
+            System.err.println("DexKnife Warning: NO SET split Or keep path, it will use Suggest!");
         }
 
         dexKnifeConfig.additionalParameters = addParams;
@@ -245,11 +245,11 @@ private static boolean genMainDexList(Project project, boolean minifyEnabled,
 
         ArrayList<String> mainClasses = null;
         if (minifyEnabled) {
-            System.out.println("DexKnife: From Mapping");
+            System.err.println("DexKnife: From Mapping");
             // get classes from mapping
             mainClasses = getMainClassesFromMapping(mappingFile, dexKnifeConfig.patternSet, mainCls);
         } else {
-            System.out.println("DexKnife: From Merged Jar: " + jarMergingOutputFile);
+            System.err.println("DexKnife: From Merged Jar: " + jarMergingOutputFile);
             if (jarMergingOutputFile != null) {
                 // get classes from merged jar
                 mainClasses = getMainClassesFromJar(jarMergingOutputFile, dexKnifeConfig.patternSet, mainCls);
@@ -275,7 +275,7 @@ private static boolean genMainDexList(Project project, boolean minifyEnabled,
             return true;
         }
 
-        throw new Exception("DexKnife Warnning: Main dex is EMPTY ! Check your config and project!");
+        throw new Exception("DexKnife Warning: Main dex is EMPTY ! Check your config and project!");
     }
 
     private static ArrayList<String> getMainClassesFromJar(
@@ -348,7 +348,7 @@ private static ArrayList<String> getMainClassesFromMapping(
      */
     private static HashSet<String> getAdtMainDexClasses(File outputDir) throws Exception {
         if (outputDir == null || !outputDir.exists()) {
-            System.err.println("DexKnife Warnning: Android recommand Main dex is no exist, try run again!");
+            System.err.println("DexKnife Warning: Android recommand Main dex is no exist, try run again!");
             return null;
         }
 

DexKnifePlugin/gradle-dexknife-plugin/src/main/groovy/com/ceabie/dexknife/DexSplitTools.java

@@ -1,6 +1,20 @@
+/*
+ * Copyright (C) 2016 ceabie (https://github.com/ceabie/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.ceabie.dexknife
 
-import com.android.build.gradle.internal.pipeline.TransformTask
 import com.android.build.gradle.internal.transforms.DexTransform
 import com.android.builder.core.AndroidBuilder
 import com.android.builder.core.DexOptions