prepare for Tinker release 1.6.1

1. remove 7zip lib
2. fix Android N error
3. fix Tencent#18 issue

Author: shwenzhang

README.md

@@ -1,6 +1,6 @@
 ## Tinker
 [![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/tinker/blob/master/LICENSE)
-[![Release Version](https://img.shields.io/badge/release-1.6.0-red.svg)](https://github.com/Tencent/tinker/releases) 
+[![Release Version](https://img.shields.io/badge/release-1.6.1-red.svg)](https://github.com/Tencent/tinker/releases) 
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/tinker/pulls)
 
 Tinker is a hot-fix solution library for Android, it supports dex, library and resources update without reinstalling apk.
@@ -13,7 +13,7 @@ Add tinker-gradle-plugin as a dependency in your main `build.gradle` in the root
 ```gradle
 buildscript {
     dependencies {
-        classpath ('com.tencent.tinker:tinker-patch-gradle-plugin:1.6.0')
+        classpath ('com.tencent.tinker:tinker-patch-gradle-plugin:1.6.1')
     }
 }
 ```
@@ -23,9 +23,9 @@ Then you need to "apply" the plugin and add dependencies by adding the following
 ```gradle
 dependencies {
     //optional, help to generate the final application 
-    compile('com.tencent.tinker:tinker-android-anno:1.6.0')
+    compile('com.tencent.tinker:tinker-android-anno:1.6.1')
     //tinker's main Android lib
-    compile('com.tencent.tinker:tinker-android-lib:1.6.0') 
+    compile('com.tencent.tinker:tinker-android-lib:1.6.1') 
 }
 ...
 ...
@@ -74,6 +74,8 @@ For more tinker configurations, learn more at the sample [app/build.gradle](http
 There are some issues which Tinker can't dynamic update.
 
 1. Update AndroidManifest.xml, such as add Android Component.
+2. Do not support some Samsung models with os version android-19.
+3. Due to Google Play Developer Distribution Agreement, we can't dynamic update our apk.
 
 ## Support
 Any problem?

gradle.properties

@@ -16,5 +16,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME_PREFIX=1.6.0
+VERSION_NAME_PREFIX=1.6.1
 VERSION_NAME_SUFFIX=

settings.gradle

@@ -5,6 +5,5 @@ include ':tinker-android:tinker-android-anno'
 include ':tinker-build:tinker-patch-cli'
 include ':tinker-build:tinker-patch-lib'
 include ':tinker-build:tinker-patch-gradle-plugin'
-include ':third-party:seven-zip'
 include ':third-party:aosp-dexutils'
 include ':third-party:bsdiff-util'

third-party/seven-zip/.gitignore

@@ -49,14 +49,18 @@ public String toString() {
         sb.append("isSuccess:" + isSuccess + "\n");
         sb.append("rawPatchFilePath:" + rawPatchFilePath + "\n");
         sb.append("costTime:" + costTime + "\n");
-        sb.append("patchVersion:" + patchVersion + "\n");
-        sb.append("patchTinkerID:" + patchTinkerID + "\n");
-        sb.append("baseTinkerID:" + baseTinkerID + "\n");
+        if (patchVersion != null) {
+            sb.append("patchVersion:" + patchVersion + "\n");
+        }
+        if (patchTinkerID != null) {
+            sb.append("patchTinkerID:" + patchTinkerID + "\n");
+        }
+        if (baseTinkerID != null) {
+            sb.append("baseTinkerID:" + baseTinkerID + "\n");
+        }
 
         if (e != null) {
             sb.append("Throwable:" + e.getMessage() + "\n");
-        } else {
-            sb.append("Throwable: null" + "\n");
         }
         return sb.toString();
     }

third-party/seven-zip/License.txt

@@ -45,6 +45,7 @@ public class TinkerInstaller {
      */
     public static void install(ApplicationLike applicationLike) {
         Tinker tinker = new Tinker.Builder(applicationLike.getApplication()).build();
+        Tinker.create(tinker);
         tinker.install(applicationLike.getTinkerResultIntent());
     }
 

third-party/seven-zip/build.gradle

@@ -133,11 +133,11 @@ public class ShareConstants {
     public static final int ERROR_LOAD_PATCH_REWRITE_PATCH_INFO_FAIL              = -18;
     public static final int ERROR_LOAD_PATCH_UNKNOWN_EXCEPTION                    = -19;
     //resource
-    public static final int ERROR_LOAD_PATCH_VERSION_RESOURCE_DIRECTORY_NOT_EXIST = -21;
-    public static final int ERROR_LOAD_PATCH_VERSION_RESOURCE_FILE_NOT_EXIST      = -22;
-    public static final int ERROR_LOAD_PATCH_VERSION_RESOURCE_LOAD_EXCEPTION      = -23;
-    public static final int ERROR_LOAD_PATCH_VERSION_RESOURCE_MD5_MISMATCH        = -24;
-    public static final int ERROR_LOAD_PATCH_UNCAUGHT_EXCEPTION                   = -25;
+    public static final int ERROR_LOAD_PATCH_VERSION_RESOURCE_DIRECTORY_NOT_EXIST = -20;
+    public static final int ERROR_LOAD_PATCH_VERSION_RESOURCE_FILE_NOT_EXIST      = -21;
+    public static final int ERROR_LOAD_PATCH_VERSION_RESOURCE_LOAD_EXCEPTION      = -22;
+    public static final int ERROR_LOAD_PATCH_VERSION_RESOURCE_MD5_MISMATCH        = -23;
+    public static final int ERROR_LOAD_PATCH_UNCAUGHT_EXCEPTION                   = -24;
 
     public static final int ERROR_LOAD_GET_INTENT_FAIL = -10000;
 

third-party/seven-zip/executable/SevenZip-linux-x86_32.exe

@@ -119,7 +119,7 @@ public static void generatePublicResourceXml(AaptResourceCollector aaptResourceC
 //                        if (rType.equals(RType.STYLE)) {
                             String rawName = aaptResourceCollector.getRawName(rDotTxtEntry.name);
                             if (StringUtil.isBlank(rawName)) {
-                                System.err.println("Blank?" + rDotTxtEntry.name);
+//                                System.err.println("Blank?" + rDotTxtEntry.name);
                                 rawName = rDotTxtEntry.name;
                             }
                             publicWriter.println("<public type=\"" + rType + "\" name=\"" + rawName + "\" id=\"" + rDotTxtEntry.idValue + "\" />");

third-party/seven-zip/executable/SevenZip-linux-x86_64.exe

@@ -212,6 +212,7 @@ public void onAllPatchesEnd() throws Exception {
 
                 relatedInfo.dexDiffFile = dexDiffOut;
                 relatedInfo.dexDiffMd5 = MD5.getMD5(dexDiffOut);
+                Logger.d("\nGen %s patch file:%s, size:%d, md5:%s", dexName, relatedInfo.dexDiffFile.getAbsolutePath(), relatedInfo.dexDiffFile.length(), relatedInfo.dexDiffMd5);
 
                 File tempFullPatchedDexFile = new File(tempFullPatchDexPath, dexName);
 
@@ -238,7 +239,7 @@ public void onAllPatchesEnd() throws Exception {
                 if (!tempFullPatchedDexFile.exists()) {
                     throw new TinkerPatchException("can not find the temporary full patched dex file:" + tempFullPatchedDexFile.getAbsolutePath());
                 }
-                Logger.e("Gen %s for dalvik full dex file:%s, size:%d, md5:%s", dexName, tempFullPatchedDexFile.getAbsolutePath(), tempFullPatchedDexFile.length(), relatedInfo.newOrFullPatchedMd5);
+                Logger.d("\nGen %s for dalvik full dex file:%s, size:%d, md5:%s", dexName, tempFullPatchedDexFile.getAbsolutePath(), tempFullPatchedDexFile.length(), relatedInfo.newOrFullPatchedMd5);
             } else {
                 // In this case newDexFile is the same as oldDexFile, but we still
                 // need to treat it as patched dex file so that the SmallPatchGenerator
@@ -356,7 +357,7 @@ public void onAllPatchesEnd() throws Exception {
                     throw new TinkerPatchException("can not find the temporary small patched dex file:" + tempSmallPatchInfoFile.getAbsolutePath());
                 }
                 relatedInfo.smallPatchedMd5 = MD5.getMD5(tempSmallPatchedFile);
-                Logger.e("Gen %s for art small dex file:%s, size:%d, md5:%s", dexName, tempSmallPatchedFile.getAbsolutePath(), tempSmallPatchedFile.length(), relatedInfo.smallPatchedMd5);
+                Logger.d("\nGen %s for art small dex file:%s, size:%d, md5:%s", dexName, tempSmallPatchedFile.getAbsolutePath(), tempSmallPatchedFile.length(), relatedInfo.smallPatchedMd5);
 
                 if (relatedInfo.oldMd5.equals(relatedInfo.newMd5)) {
                     // Unmodified dex, which has no dexDiffFile, and is ignored in dvm environment.
@@ -531,7 +532,7 @@ private void addTestDex() throws IOException {
 
         File dest = new File(config.mTempResultDir + "/" + TEST_DEX_PATH);
         FileOperation.copyResourceUsingStream(TEST_DEX_PATH, dest);
-        Logger.d("Add test install result dex: %s, size:%d", dest.getAbsolutePath(), dest.length());
+        Logger.d("\nAdd test install result dex: %s, size:%d", dest.getAbsolutePath(), dest.length());
         Logger.d("DexDecoder:write test dex meta file data: %s", meta);
 
         metaWriter.writeLineToInfoFile(meta);

third-party/seven-zip/executable/SevenZip-osx-x86_64.exe

@@ -59,7 +59,6 @@ public class TypedValue {
     public static final String RES_MANIFEST    = "AndroidManifest.xml";
     public static final String RES_OUT         = "resources_out.zip";
     public static final String RES_OUT_7ZIP    = "resources_out_7z.zip";
-    public static final String RES_OUT_MD5_TAG = "%RES_OUT_MD5_TAG%";
 
     public static final int ADD       = 1;
     public static final int MOD       = 2;

third-party/seven-zip/executable/SevenZip-windows-x86_32.exe

@@ -6,17 +6,31 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile "com.android.support:appcompat-v7:23.1.1"
-    compile("com.tencent.tinker:tinker-android-lib:${TINKER_VERSION}")
-    compile("com.tencent.tinker:tinker-android-anno:${TINKER_VERSION}")
+    compile("com.tencent.tinker:tinker-android-lib:${TINKER_VERSION}") { changing = true }
+    compile("com.tencent.tinker:tinker-android-anno:${TINKER_VERSION}") { changing = true }
     compile "com.android.support:multidex:1.0.1"
 
+    //use for local maven test
+    compile("com.tencent.tinker:tinker-android-loader:${TINKER_VERSION}") { changing = true }
+    compile("com.tencent.tinker:aosp-dexutils:${TINKER_VERSION}") { changing = true }
+    compile("com.tencent.tinker:bsdiff-util:${TINKER_VERSION}") { changing = true }
+    compile("com.tencent.tinker:tinker-commons:${TINKER_VERSION}") { changing = true }
+
     //use to test multiDex
 //    compile group: 'com.google.guava', name: 'guava', version: '19.0'
 //    compile "org.scala-lang:scala-library:2.11.7"
 }
 
 def gitSha() {
-    return 'git rev-parse --short HEAD'.execute().text.trim()
+    try {
+        String gitRev = 'git rev-parse --short HEAD'.execute().text.trim()
+        if (gitRev == null) {
+            throw new GradleException("can't get git rev, you should add git to system path or just input test value, such as 'testTinkerId'")
+        }
+        return gitRev
+    } catch (Exception e) {
+        throw new GradleException("can't get git rev, you should add git to system path or just input test value, such as 'testTinkerId'")
+    }
 }
 
 def javaVersion = JavaVersion.VERSION_1_7

third-party/seven-zip/executable/SevenZip-windows-x86_64.exe

@@ -83,7 +83,7 @@ public void onBaseContextAttached(Context base) {
         MultiDex.install(base);
 
         SampleApplicationContext.application = getApplication();
-        SampleApplicationContext.context = getApplication().getApplicationContext();
+        SampleApplicationContext.context = getApplication();
         TinkerManager.setTinkerApplicationLike(this);
         TinkerManager.initFastCrashProtect();
         //should set before tinker is installed

third-party/seven-zip/gradle.properties

@@ -17,5 +17,4 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-TINKER_VERSION=1.6.0
-
+TINKER_VERSION=1.6.1

tinker-android/tinker-android-lib/src/main/java/com/tencent/tinker/lib/service/PatchResult.java

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 rm -rf ~/.gradle/caches/modules-2/metadata-2.16/descriptors/com.tencent.tinker
 
+#rm -rf ~/.m2/repository/com/tencent/tinker
 #adb push ./app/build/outputs/tinkerPatch/debug/patch_signed_7zip.apk /storage/sdcard0/