Fixed issues related to Gradle 6 and Android Studio 4.0 gradle plugin

Author: fmoda3

third-party/aosp-dexutils/src/main/java/com/tencent/tinker/android/dex/Mutf8.java

@@ -107,7 +107,7 @@ public static void encode(byte[] dst, int offset, String s) {
      * Returns an array containing the <i>modified UTF-8</i> form of {@code s}.
      */
     public static byte[] encode(String s) throws UTFDataFormatException {
-        int utfCount = (int) countBytes(s, true);
+        int utfCount = (int) countBytes(s, false);
         byte[] result = new byte[utfCount];
         encode(result, 0, s);
         return result;

third-party/aosp-dexutils/src/main/java/com/tencent/tinker/android/dex/StringData.java

@@ -54,7 +54,7 @@ public boolean equals(Object obj) {
     @Override
     public int byteCountInDex() {
         try {
-            return Leb128.unsignedLeb128Size(value.length()) + (int) Mutf8.countBytes(value, true) + SizeOf.UBYTE;
+            return Leb128.unsignedLeb128Size(value.length()) + (int) Mutf8.countBytes(value, false) + SizeOf.UBYTE;
         } catch (UTFDataFormatException e) {
             throw new DexException(e);
         }

tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/TinkerPatchPlugin.groovy

@@ -132,7 +132,6 @@ class TinkerPatchPlugin implements Plugin<Project> {
 
             android.applicationVariants.all { variant ->
                 def variantName = variant.name.capitalize()
-                def variantData = variant.variantData
 
                 def instantRunTask = getInstantRunTask(variantName)
                 if (instantRunTask != null) {
@@ -145,7 +144,7 @@ class TinkerPatchPlugin implements Plugin<Project> {
 
                 TinkerPatchSchemaTask tinkerPatchBuildTask = mProject.tasks.create("tinkerPatch${variantName}", TinkerPatchSchemaTask)
 
-                tinkerPatchBuildTask.signConfig = variantData.variantConfiguration.signingConfig
+                tinkerPatchBuildTask.signConfig = variant.signingConfig
 
                 def agpProcessManifestTask = project.tasks.findByName("process${variantName}Manifest")
                 String manifestOutputBaseDir
@@ -187,7 +186,7 @@ class TinkerPatchPlugin implements Plugin<Project> {
 
                 //resource id
                 TinkerResourceIdTask applyResourceTask = mProject.tasks.create("tinkerProcess${variantName}ResourceId", TinkerResourceIdTask)
-                applyResourceTask.applicationId = variantData.getApplicationId()
+                applyResourceTask.applicationId = variant.mergedFlavor.applicationId
                 applyResourceTask.variantName = variant.name
                 applyResourceTask.resDir = resDir
 
@@ -220,7 +219,7 @@ class TinkerPatchPlugin implements Plugin<Project> {
                 }
 
                 // Add this multidex proguard settings file to the list
-                boolean multiDexEnabled = variantData.variantConfiguration.isMultiDexEnabled()
+                boolean multiDexEnabled = variant.mergedFlavor.multiDexEnabled
 
                 if (multiDexEnabled) {
                     TinkerMultidexConfigTask multidexConfigTask = mProject.tasks.create("tinkerProcess${variantName}MultidexKeep", TinkerMultidexConfigTask)
@@ -518,4 +517,4 @@ class TinkerPatchPlugin implements Plugin<Project> {
         return multiDexKeepProguard
     }
 
-}
+}

tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/transform/ImmutableDexTransform.groovy

@@ -357,8 +357,8 @@ public class ImmutableDexTransform extends Transform {
 
     public static void inject(Project project, def variant) {
         project.logger.info("prepare inject dex transform ")
-        if (!variant.variantData.variantConfiguration.isMultiDexEnabled()) {
-            project.logger.warn("multidex is diable. we will not replace the dex transform.")
+        if (!variant.mergedFlavor.multiDexEnabled) {
+            project.logger.warn("multidex is disabled. we will not replace the dex transform.")
             return
         }
         if (!FileOperation.isLegalFile(project.tinkerPatch.oldApk)) {

tinker-sample-android/app/build.gradle

@@ -86,6 +86,7 @@ android {
          * you can use multiDex and install it in your ApplicationLifeCycle implement
          */
         multiDexEnabled true
+        multiDexKeepProguard file("tinker_multidexkeep.pro")
         /**
          * buildConfig can change during patch!
          * we can use the newly value when patch

tinker-sample-android/app/tinker_multidexkeep.pro

@@ -0,0 +1,35 @@
+
+#tinker multidex keep patterns:
+-keep public class * implements com.tencent.tinker.entry.ApplicationLifeCycle {
+    <init>(...);
+    void onBaseContextAttached(android.content.Context);
+}
+
+-keep public class com.tencent.tinker.entry.ApplicationLifeCycle {
+    *;
+}
+
+-keep public class * extends com.tencent.tinker.loader.TinkerLoader {
+    <init>(...);
+}
+
+-keep public class * extends android.app.Application {
+     <init>();
+     void attachBaseContext(android.content.Context);
+}
+
+-keep class com.tencent.tinker.loader.TinkerTestAndroidNClassLoader {
+    <init>(...);
+}
+
+#your dex.loader patterns here
+-keep class tinker.sample.android.app.SampleApplication {
+    <init>(...);
+}
+
+-keep class com.tencent.tinker.loader.** {
+    <init>(...);
+}
+
+-keep class android.support.test.internal** { *; }
+-keep class org.junit.** { *; }

tinker-sample-android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         if (project.hasProperty('GRADLE_3') && GRADLE_3.equalsIgnoreCase('TRUE')) {
-            classpath 'com.android.tools.build:gradle:3.2.1'
+            classpath 'com.android.tools.build:gradle:4.0.0-alpha09'
         } else {
             classpath 'com.android.tools.build:gradle:2.3.3'
         }

tinker-sample-android/gradle.properties

@@ -20,5 +20,4 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryErr
 TINKER_VERSION=1.9.14.3
 GRADLE_3=true
 
-android.enableAapt2=false
 #tinker.aapt2.public=false

tinker-sample-android/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Tue Oct 24 15:01:44 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

tinker-sample-android/gradle/wrapper/gradle-wrapper.properties

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"