0.7.4

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.4  (2017-10-20)
+
+Bugfixes:
+
+   - 修复自定义编译任务增量对比的问题
+
 ## 0.7.3  (2017-10-20)
 
 Bugfixes:

README.md

@@ -40,7 +40,7 @@ Android API 9(2.3)+  ; android-gradle-build 2.0.0+
         }
         
         dependencies {
-            classpath 'com.github.typ0520:fastdex-gradle:0.7.3'
+            classpath 'com.github.typ0520:fastdex-gradle:0.7.4'
         }
     }
    	````

fastdex-build-lib/src/main/java/fastdex/build/lib/snapshoot/file/FileDiffInfo.java

@@ -41,25 +41,25 @@ public int hashCode() {
         int result = super.hashCode();
         int nowLastModified = 0;
 
-        if (now != null) {
-            nowLastModified = (int) (((FileNode)now).lastModified ^ (((FileNode)now).lastModified >>> 32));
+        if (now != null && now.md5 == null) {
+            nowLastModified = (int) (now.lastModified ^ (now.lastModified >>> 32));
         }
 
         int oldLastModified = 0;
-        if (old != null) {
-            oldLastModified = (int) (((FileNode)old).lastModified ^ (((FileNode)old).lastModified >>> 32));
+        if (old != null && old.md5 == null) {
+            oldLastModified = (int) (old.lastModified ^ (old.lastModified >>> 32));
         }
 
         int nowFileLength = 0;
         int oldFileLength = 0;
         if (now != null) {
-            nowFileLength = (int) (((FileNode)now).fileLength ^ (((FileNode)now).fileLength >>> 32));
+            nowFileLength = (int) (now.fileLength ^ (now.fileLength >>> 32));
         }
         if (old != null) {
-            oldFileLength = (int) (((FileNode)old).fileLength ^ (((FileNode)old).fileLength >>> 32));
+            oldFileLength = (int) (old.fileLength ^ (old.fileLength >>> 32));
         }
-        result = 31 * result + (now != null ? (now.hashCode() + nowLastModified + nowFileLength) : 0);
-        result = 31 * result + (old != null ? (old.hashCode() + oldLastModified + oldFileLength) : 0);
+        result = 31 * result + (now != null && now.md5 != null ? (now.md5.hashCode() + nowLastModified + nowFileLength) : 0);
+        result = 31 * result + (old != null && old.md5 != null ? (old.md5.hashCode() + oldLastModified + oldFileLength) : 0);
         return result;
     }
 }

fastdex-build-lib/src/main/java/fastdex/build/lib/snapshoot/file/FileNode.java

@@ -9,11 +9,10 @@
  * Created by tong on 17/3/29.
  */
 public class FileNode extends Node {
-    //public String absolutePath;
     public String nodePath;
+    public String md5;
     public long lastModified;
     public long fileLength;
-    public String md5;
 
     @Override
     public String getUniqueKey() {
@@ -22,20 +21,19 @@ public String getUniqueKey() {
 
     @Override
     public boolean diffEquals(Node anNode) {
-        if (this == anNode) return true;
-        if (anNode == null) return false;
+        if (!super.diffEquals(anNode))
+            return false;
 
         FileNode fileNode = (FileNode) anNode;
-        if (fileLength != fileNode.fileLength) return false;
-
-
-        if (lastModified != fileNode.lastModified) {
-            if (md5 != null && md5.equals(((FileNode) anNode).md5)) {
-                return true;
-            }
+        if (fileLength != fileNode.fileLength)
             return false;
+
+        if (md5 != null) {
+            return md5.equals(((FileNode) anNode).md5);
+        }
+        else {
+            return lastModified == fileNode.lastModified;
         }
-        return equals(fileNode);
     }
 
     @Override

fastdex-build-lib/src/main/java/fastdex/build/lib/snapshoot/sourceset/SourceSetDiffResultSet.java

@@ -16,7 +16,7 @@
  * Created by tong on 17/3/31.
  */
 public class SourceSetDiffResultSet extends DiffResultSet<StringDiffInfo> {
-    public final Set<JavaFileDiffInfo> changedJavaFileDiffInfos = new HashSet<JavaFileDiffInfo>();
+    public final Set<JavaFileDiffInfo> changedJavaFileDiffInfos = new HashSet<>();
 
     @Expose
     public Set<String> addOrModifiedClasses = new HashSet<>();
@@ -86,9 +86,7 @@ public boolean equals(Object o) {
         if (!super.equals(o)) return false;
 
         SourceSetDiffResultSet resultSet = (SourceSetDiffResultSet) o;
-
-        return changedJavaFileDiffInfos != null ? changedJavaFileDiffInfos.equals(resultSet.changedJavaFileDiffInfos) : resultSet.changedJavaFileDiffInfos == null;
-
+        return changedJavaFileDiffInfos.equals(resultSet.changedJavaFileDiffInfos);
     }
 
     @Override

fastdex-gradle/build.gradle

@@ -21,4 +21,8 @@ tasks['install'].doLast {
     if ("install".equals(launchTaskName)) {
         project.file('build/libs').deleteDir()
     }
+}
+
+tasks['bintrayUpload'].doLast {
+    project.file('build/libs').deleteDir()
 }

fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexResourceIdTask.groovy

@@ -3,9 +3,7 @@ package fastdex.build.task
 import fastdex.build.util.Constants
 import fastdex.common.utils.FileUtils
 import fastdex.build.variant.FastdexVariant
-import org.gradle.api.DefaultTask
 import org.gradle.api.Project
-import org.gradle.api.tasks.TaskAction
 import fastdex.build.lib.aapt.AaptResourceCollector
 import fastdex.build.lib.aapt.AaptUtil
 import fastdex.build.lib.aapt.PatchUtil

gradle.properties

@@ -20,7 +20,7 @@
 org.gradle.daemon=true
 
 groupId=com.github.typ0520
-version=0.7.3
+version=0.7.4
 
 ANDROID_BUILD_MIN_SDK_VERSION=14
 ANDROID_BUILD_TARGET_SDK_VERSION=22

sample/build.gradle

@@ -13,7 +13,7 @@ buildscript {
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath "me.tatarka:gradle-retrolambda:3.6.0"
         classpath 'com.jakewharton:butterknife-gradle-plugin:8.8.1'
-        classpath 'com.github.typ0520:fastdex-gradle:0.7.3'
+        classpath 'com.github.typ0520:fastdex-gradle:0.7.4'
     }
 }