Release 3.4.2

sensorsdata · Sep 30, 2021 · fd2808f · fd2808f
1 parent e76aeb5
commit fd2808f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/plugin/ext.gradle b/plugin/ext.gradle
@@ -1,5 +1,5 @@
 project.ext {
-    pluginVersion = '3.4.1'
+    pluginVersion = '3.4.2'
     Properties properties = new Properties()
     if (project.file('local.properties').exists()) {
         properties.load(project.file('local.properties').newDataInputStream())

diff --git a/...in/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsPlugin.groovy b/...in/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsPlugin.groovy
@@ -29,22 +29,14 @@ class SensorsAnalyticsPlugin implements Plugin<Project> {
         Instantiator ins = ((DefaultGradle) project.getGradle()).getServices().get(Instantiator)
         def args = [ins] as Object[]
         SensorsAnalyticsExtension extension = project.extensions.create("sensorsAnalytics", SensorsAnalyticsExtension, args)
+        Map<String, ?> properties = project.getProperties()
+        boolean disableSensorsAnalyticsPlugin = Boolean.parseBoolean(properties.getOrDefault("sensorsAnalytics.disablePlugin", "false")) ||
+                Boolean.parseBoolean(properties.getOrDefault("disableSensorsAnalyticsPlugin", "false"))
+        boolean disableSensorsAnalyticsMultiThreadBuild = Boolean.parseBoolean(properties.getOrDefault("sensorsAnalytics.disableMultiThreadBuild", "false"))
+        boolean disableSensorsAnalyticsIncrementalBuild = Boolean.parseBoolean(properties.getOrDefault("sensorsAnalytics.disableIncrementalBuild", "false"))
+        boolean isHookOnMethodEnter = Boolean.parseBoolean(properties.getOrDefault("sensorsAnalytics.isHookOnMethodEnter", "false"))
+        boolean isAndroidTv = Boolean.parseBoolean(properties.getOrDefault("sensorsAnalytics.isAndroidTv", "false"))
 
-        boolean disableSensorsAnalyticsPlugin = false
-        boolean disableSensorsAnalyticsMultiThreadBuild = false
-        boolean disableSensorsAnalyticsIncrementalBuild = false
-        boolean isHookOnMethodEnter = false
-        boolean isAndroidTv = false
-        Properties properties = new Properties()
-        if (project.rootProject.file('gradle.properties').exists()) {
-            properties.load(project.rootProject.file('gradle.properties').newDataInputStream())
-            disableSensorsAnalyticsPlugin = Boolean.parseBoolean(properties.getProperty("sensorsAnalytics.disablePlugin", "false")) ||
-                    Boolean.parseBoolean(properties.getProperty("disableSensorsAnalyticsPlugin", "false"))
-            disableSensorsAnalyticsMultiThreadBuild = Boolean.parseBoolean(properties.getProperty("sensorsAnalytics.disableMultiThreadBuild", "false"))
-            disableSensorsAnalyticsIncrementalBuild = Boolean.parseBoolean(properties.getProperty("sensorsAnalytics.disableIncrementalBuild", "false"))
-            isHookOnMethodEnter = Boolean.parseBoolean(properties.getProperty("sensorsAnalytics.isHookOnMethodEnter", "false"))
-            isAndroidTv = Boolean.parseBoolean(properties.getProperty("sensorsAnalytics.isAndroidTv", "false"))
-        }
         if (!disableSensorsAnalyticsPlugin) {
             AppExtension appExtension = project.extensions.findByType(AppExtension.class)
             SensorsAnalyticsTransformHelper transformHelper = new SensorsAnalyticsTransformHelper(extension, appExtension)
@@ -56,6 +48,5 @@ class SensorsAnalyticsPlugin implements Plugin<Project> {
         } else {
             Logger.error("------------您已关闭了神策插件--------------")
         }
-
     }
 }
diff --git a/...src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransform.groovy b/...src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransform.groovy
@@ -48,7 +48,7 @@ import java.util.jar.JarOutputStream
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.4.1"
+    public static final String VERSION = "3.4.2"
     public static final String MIN_SDK_VERSION = "5.4.3"
     private WaitableExecutor waitableExecutor
     private URLClassLoader urlClassLoader

diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsUtil.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsUtil.groovy
@@ -24,7 +24,7 @@ import org.objectweb.asm.Type
 
 @CompileStatic
 class SensorsAnalyticsUtil {
-    public static final int ASM_VERSION = Opcodes.ASM6
+    public static final int ASM_VERSION = Opcodes.ASM7
     private static final HashSet<String> targetFragmentClass = new HashSet()
     private static final HashSet<String> targetMenuMethodDesc = new HashSet()
     private static final HashSet<String> specialClass = new HashSet()