[合并] 解决冲突

gradle/bytex/bytex_matrix.gradle

@@ -1,13 +1,10 @@
-if (!rootProject.isReleaseBuild()) {
-    apply plugin: 'bytex.matrix'
+apply plugin: 'bytex.matrix'
 
-    matrix {
-        trace {
-            enable = true    //if you don't want to use trace canary, set false
-            baseMethodMapFile = "${project.buildDir}/matrix_output/customMethodMapping.txt"
-            blackListFile = "${project.projectDir}/matrixTrace/blackMethodList.txt"
-        }
-        logLevel = "D"
+matrix {
+    trace {
+        enable = true    //if you don't want to use trace canary, set false
+        baseMethodMapFile = "${project.buildDir}/matrix_output/customMethodMapping.txt"
+        blackListFile = "${project.projectDir}/matrixTrace/blackMethodList.txt"
     }
-}
-
+    logLevel = "D"
+}