fixbug

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.3  (2017-10-20)
+
+Bugfixes:
+
+   - 修复javaPreCompile任务执行顺序错误的问题
+
 ## 0.7.2  (2017-10-18)
 
 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.2'
+            classpath 'com.github.typ0520:fastdex-gradle:0.7.3'
         }
     }
    	````

fastdex-gradle/src/main/groovy/fastdex/build/FastdexPlugin.groovy

@@ -209,6 +209,9 @@ class FastdexPlugin implements Plugin<Project> {
                         if (customJavacTask.javacIncrementalSafeguard != null) {
                             customJavacTask.javacIncrementalSafeguard.mustRunAfter customJavacTask
                         }
+                        if (customJavacTask.javaPreCompile != null) {
+                            customJavacTask.javaPreCompile.mustRunAfter customJavacTask
+                        }
                         javaCompile.dependsOn customJavacTask
                         scanAptOutputTask.mustRunAfter customJavacTask
                     }

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

@@ -44,10 +44,18 @@ public class FastdexCustomJavacTask extends DefaultTask {
         javaCompile.enabled = false
 
         if (javacIncrementalSafeguard != null) {
-            javacIncrementalSafeguard.enabled = false
+            try {
+                javacIncrementalSafeguard.enabled = false
+            } catch (Throwable e) {
+
+            }
         }
         if (javaPreCompile != null) {
-            javaPreCompile.enabled = false
+            try {
+                javaPreCompile.enabled = false
+            } catch (Throwable e) {
+
+            }
         }
     }
 

gradle.properties

@@ -20,7 +20,7 @@
 org.gradle.daemon=true
 
 groupId=com.github.typ0520
-version=0.7.2
+version=0.7.3
 
 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.2'
+        classpath 'com.github.typ0520:fastdex-gradle:0.7.3'
     }
 }