Release 3.3.6

Author: weiqiangliu

plugin/bintray.gradle

@@ -7,120 +7,76 @@ apply plugin: 'maven'
 version = pluginVersion
 project.archivesBaseName = "android-gradle-plugin2"
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
 task sourceJar(type: Jar) {
     classifier = 'sources'
     from sourceSets.main.allSource
 }
 
-ext {
-    pomFilePath = "${project.buildDir.absolutePath}/tmp/pom.xml"
-    pomFile = file(pomFilePath)
-}
-
-configurations {
-    pom
-}
-
-artifacts {
-    archives jar
-    archives sourceJar
-    archives javadocJar
-    if (pomFile.exists()) {
-        pom pomFile
+javadoc {
+    options {
+        encoding "UTF-8"
+        charSet 'UTF-8'
     }
 }
 
-task signJars(type: Sign, dependsOn: [jar, javadocJar, sourceJar]) {
-    sign configurations.archives
-}
-
-task signPom(type: Sign) {
-    sign configurations.pom
-}
-
-if (project.ext.pomFile.exists()) {
-    task preparePublication(dependsOn: [signJars, signPom])
-} else {
-    task preparePublication(dependsOn: signJars)
-}
-
-def getSignatureFiles = {
-    def allFiles = project.tasks.signJars.signatureFiles.collect{it}
-    def signedSources = allFiles.find{ it.name.contains('-sources') }
-    def signedJavadoc = allFiles.find{ it.name.contains('-javadoc') }
-    def signedJar = (allFiles - [signedSources, signJars])[0]
-    return [
-            [archive: signedSources, classifier: 'sources', extension: 'jar.asc'],
-            [archive: signedJavadoc, classifier: 'javadoc', extension: 'jar.asc'],
-            [archive: signedJar, classifier: 'null', extension: 'jar.asc']
-    ]
-}
-
-def getPomSignature = {
-    return project.tasks.signPom.signatureFiles.collect{ it }[0]
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
 }
 
-def siteUrl = 'https://github.com/sensorsdata/sa-sdk-android-plugin2'
-def gitUrl = 'https://github.com/sensorsdata/sa-sdk-android-plugin2.git'
-def issueUrl = 'https://github.com/sensorsdata/sa-sdk-android-plugin2/issues'
-group = "com.sensorsdata.analytics.android"
-
-install {
-    repositories.mavenInstaller {
-// generates POM.xml with proper parameters
-        pom {
-            project {
+publishing {
+    publications {
+        mavenAndroid(MavenPublication) {
+            groupId = 'com.sensorsdata.analytics.android'
+            artifactId = 'android-gradle-plugin2'
+            version = version
+            artifact sourceJar
+            artifact javadocJar
+            artifact jar
+            // 配置 pop 文件格式
+            pom {
                 packaging 'jar'
-                name 'The official Android SDK Plugin for Sensors Analytics.'
-                description 'The official Android SDK Plugin for Sensors Analytics.'
-                url siteUrl
-
+                name = 'The official Android SDK Plugin for Sensors Analytics.'
+                description = 'The official Android SDK Plugin for Sensors Analytics.'
+                url = 'The official Android SDK Plugin for Sensors Analytics.'
                 licenses {
                     license {
-                        name 'The Apache Software License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        name='The Apache Software License, Version 2.0'
+                        url='http://www.apache.org/licenses/LICENSE-2.0.txt'
                     }
                 }
                 developers {
                     developer {
-                        id 'zouyuhan'
-                        name 'Yuhan ZOU'
-                        email 'zouyuhan@sensorsdata.cn'
+                        id = 'dengshiwei'
+                        name = 'dengshiwei'
+                        email = 'dengshiwei@sensorsdata.com'
                     }
                 }
-
                 scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
+                    connection = 'https://github.com/sensorsdata/sa-sdk-android-plugin2'
+                    developerConnection = 'https://github.com/sensorsdata/sa-sdk-android-plugin2.git'
+                    url = 'https://github.com/sensorsdata/sa-sdk-android-plugin2'
                 }
             }
         }
     }
+    // 配置远程仓库
+    repositories {
+        Properties properties = new Properties()
+        properties.load(project.rootProject.file('local.properties').newDataInputStream())
+        def mavenUser = properties.getProperty("maven.user")
+        def mavenPassword = properties.getProperty("maven.password")
+        maven {
+            url = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+            credentials {
+                username mavenUser
+                password mavenPassword
+            }
+        }
+    }
 }
 
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
-
-bintray {
-    user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.apikey")
-    configurations = ['archives']
-    pkg {
-        repo = "maven"
-        name = "SensorsAnalyticsSDKPlugin2"
-        desc = 'The official Android SDK Plugin for Sensors Analytics.'
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        issueTrackerUrl = issueUrl
-        licenses = ["Apache-2.0"]
-        labels = 'Groovy'
-        publicDownloadNumbers = true
-        publish = true
-    }
+// 对 mavenAndroid 发布内容进行签名
+signing {
+    sign publishing.publications.mavenAndroid
 }

plugin/build.gradle

@@ -30,11 +30,11 @@ dependencies {
 
     implementation gradleApi()
 //    implementation localGroovy()
-    compile 'org.ow2.asm:asm:6.0'
-    compile 'org.ow2.asm:asm-commons:6.0'
-    compile 'org.ow2.asm:asm-analysis:6.0'
-    compile 'org.ow2.asm:asm-util:6.0'
-    compile 'org.ow2.asm:asm-tree:6.0'
+    compile 'org.ow2.asm:asm:9.1'
+    compile 'org.ow2.asm:asm-commons:9.1'
+    compile 'org.ow2.asm:asm-analysis:9.1'
+    compile 'org.ow2.asm:asm-util:9.1'
+    compile 'org.ow2.asm:asm-tree:9.1'
     compileOnly 'com.android.tools.build:gradle:3.4.1', {
         exclude group:'org.ow2.asm'
     }

plugin/ext.gradle

@@ -1,5 +1,5 @@
 project.ext {
-    pluginVersion = '3.3.5'
+    pluginVersion = '3.3.6'
     Properties properties = new Properties()
     if (project.file('local.properties').exists()) {
         properties.load(project.file('local.properties').newDataInputStream())

plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransform.groovy

@@ -45,7 +45,7 @@ import java.util.jar.JarOutputStream
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.3.5"
+    public static final String VERSION = "3.3.6"
     public static final String MIN_SDK_VERSION = "5.1.0"
     private WaitableExecutor waitableExecutor
     private URLClassLoader urlClassLoader
@@ -406,7 +406,7 @@ class SensorsAnalyticsTransform extends Transform {
                 byte[] sourceClassBytes = SensorsAnalyticsUtil.toByteArrayAndAutoCloseStream(new FileInputStream(classFile))
                 byte[] modifiedClassBytes = modifyClass(sourceClassBytes, classNameAnalytics)
                 if (modifiedClassBytes) {
-                    modified = new File(tempDir, className.replace('.', '') + '.class')
+                    modified = new File(tempDir, UUID.randomUUID().toString() + '.class')
                     if (modified.exists()) {
                         modified.delete()
                     }