［atlas-plugin］升级

Mirosalva · Nov 17, 2017 · 41d85a6 · 41d85a6
1 parent 7fba8e9
commit 41d85a6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/atlas-gradle-plugin/atlas-plugin/build.gradle b/atlas-gradle-plugin/atlas-plugin/build.gradle
@@ -228,7 +228,7 @@ tasks.findByName("test").enabled=false
 dependencies {
     compile localGroovy()
     compile gradleApi()
-    compile "com.taobao.android:dex_patch:1.4.4.11"
+    compile "com.taobao.android:dex_patch:1.4.4.13"
     compile "com.android.tools.build:gradle:2.3.3"
     compile "org.apache.commons:commons-lang3:3.4"
     compile "commons-lang:commons-lang:2.6"
@@ -246,4 +246,4 @@ dependencies {
 }
 
 
-version = '2.3.3.rc36'
+version = '2.3.3.rc37'
diff --git a/atlas-gradle-plugin/dexpatch/build.gradle b/atlas-gradle-plugin/dexpatch/build.gradle
@@ -33,5 +33,5 @@ dependencies {
 
 group 'com.taobao.android'
 
-version "1.4.4.11"
+version "1.4.4.13"
 
diff --git a/atlas-gradle-plugin/dexpatch/src/main/java/com/taobao/android/tools/DexPatchTool.java b/atlas-gradle-plugin/dexpatch/src/main/java/com/taobao/android/tools/DexPatchTool.java
@@ -123,6 +123,9 @@ public Boolean call() throws Exception {
         // zip file
         File patchFile = createDexPatchFile(tpatchInput.outPatchDir, patchTmpDir);
         tpatchFile.patchFile = patchFile;
+        if (!patchFile.exists()){
+            return null;
+        }
         PatchInfo curPatchInfo = createBasePatchInfo(patchFile);
 
         Profiler.release();
@@ -163,7 +166,7 @@ public Boolean call() throws Exception {
 
     private File createDexPatchFile(File outPatchDir, File patchTmpDir) throws IOException {
         File mainBundleFoder = new File(patchTmpDir, ((TpatchInput)input).mainBundleName);
-        File mainBundleFile = new File(patchTmpDir, ((TpatchInput)input).mainBundleName + ".so");
+        File mainBundleFile = new File(patchTmpDir, "lib"+((TpatchInput)input).mainBundleName.replace(".","_") + ".so");
         if (FileUtils.listFiles(mainBundleFoder, TrueFileFilter.INSTANCE, TrueFileFilter.INSTANCE)
                 .size() > 0) {
             CommandUtils.exec(mainBundleFoder, "zip -r " + mainBundleFile.getAbsolutePath() + " . -x */ -x .*");

diff --git a/atlas-gradle-plugin/dexpatch/src/main/java/com/taobao/android/tools/HotPatchTool.java b/atlas-gradle-plugin/dexpatch/src/main/java/com/taobao/android/tools/HotPatchTool.java
@@ -78,7 +78,7 @@ public File createBundleDexPatch(File newApkUnzipFolder,
                 bundleTypes.put(bundleName,1);
             }else if (hasDexPatch && hasHotDexPatch){
                 bundleTypes.put(bundleName,3);
-            }else if (!hasDexPatch && hasDexPatch){
+            }else if (!hasDexPatch && hasHotDexPatch){
                 bundleTypes.put(bundleName,2);
 
             }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,5 +33,5 @@ dependencies {

		group 'com.taobao.android'

		version "1.4.4.11"
		version "1.4.4.13"