fix miss file in assets

typ0520 · Nov 29, 2017 · 5201338 · 5201338
1 parent e528f70
commit 5201338
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.8.4  (2017-11-29)
+
+Bugfixes:
+
+   - 修复assets目录下的子目录的内容没有被打进补丁资源包的问题
+
 ## 0.8.3  (2017-11-27)
 
 Bugfixes:

diff --git a/README.md b/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.8.3'
+            classpath 'com.github.typ0520:fastdex-gradle:0.8.4'
         }
     }
    	````

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/util/FastdexInstantRun.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/util/FastdexInstantRun.groovy
@@ -4,7 +4,13 @@ import com.android.ddmlib.AndroidDebugBridge
 import com.android.ddmlib.IDevice
 import fastdex.build.variant.FastdexVariant
 import fastdex.common.utils.FileUtils
+import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.api.Project
+import java.nio.file.FileVisitResult
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.SimpleFileVisitor
+import java.nio.file.attribute.BasicFileAttributes
 
 /**
  * Created by tong on 17/3/12.
@@ -250,11 +256,22 @@ class FastdexInstantRun {
         if (dir.listFiles().length == 0) {
             return result
         }
-        for (File file : dir.listFiles()) {
-            if (file.isFile() && !file.getName().startsWith(".")) {
-                result.add(file.getName())
+
+        boolean isWindows = Os.isFamily(Os.FAMILY_WINDOWS)
+        Path path = dir.toPath()
+        Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
+            @Override
+            FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                if (!file.toFile().isHidden()) {
+                    String relativePath = path.relativize(file).toString()
+                    if (isWindows) {
+                        relativePath = relativePath.replaceAll("\\\\","/")
+                    }
+                    result.add(relativePath)
+                }
+                return FileVisitResult.CONTINUE
             }
-        }
+        })
         return result
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -20,7 +20,7 @@
 org.gradle.daemon=true
 
 groupId=com.github.typ0520
-version=0.8.3
+version=0.8.4
 
 ANDROID_BUILD_MIN_SDK_VERSION=14
 ANDROID_BUILD_TARGET_SDK_VERSION=22

diff --git a/sample/app/build.gradle b/sample/app/build.gradle
@@ -79,19 +79,19 @@ android {
         }
     }
 
-    productFlavors {
-        flavor1 {
-            if (com.android.builder.model.Version.ANDROID_GRADLE_PLUGIN_VERSION.compareTo("3.0") >= 0) {
-                flavorDimensions "versionCode"
-            }
-        }
-
-        flavor2 {
-            if (com.android.builder.model.Version.ANDROID_GRADLE_PLUGIN_VERSION.compareTo("3.0") >= 0) {
-                flavorDimensions "versionCode"
-            }
-        }
-    }
+//    productFlavors {
+//        flavor1 {
+//            if (com.android.builder.model.Version.ANDROID_GRADLE_PLUGIN_VERSION.compareTo("3.0") >= 0) {
+//                flavorDimensions "versionCode"
+//            }
+//        }
+//
+//        flavor2 {
+//            if (com.android.builder.model.Version.ANDROID_GRADLE_PLUGIN_VERSION.compareTo("3.0") >= 0) {
+//                flavorDimensions "versionCode"
+//            }
+//        }
+//    }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/sample/app/src/main/assets/font/cn/haha.txt b/sample/app/src/main/assets/font/cn/haha.txt
@@ -0,0 +1 @@
+haha
diff --git a/sample/app/src/main/assets/font/xx.txt b/sample/app/src/main/assets/font/xx.txt
@@ -0,0 +1 @@
+xxx
diff --git a/sample/app/src/main/assets/html/index.html b/sample/app/src/main/assets/html/index.html
@@ -0,0 +1 @@
+index.html
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath "me.tatarka:gradle-retrolambda:3.7.0"
         classpath 'com.jakewharton:butterknife-gradle-plugin:8.8.1'
-        classpath 'com.github.typ0520:fastdex-gradle:0.8.3'
+        classpath 'com.github.typ0520:fastdex-gradle:0.8.4'
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ Android API 9(2.3)+ ; android-gradle-build 2.0.0+ @@
             }
             dependencies {
-                classpath 'com.github.typ0520:fastdex-gradle:0.8.3'
+                classpath 'com.github.typ0520:fastdex-gradle:0.8.4'
             }
         }
        	````
@@ Expand Down @@