changes for making it work with AGP 3.0, 3.1 and 3.2 (#798)

Author: marandaneto

sentry-android-gradle-plugin/build.gradle

@@ -20,7 +20,7 @@ compileGroovy {
 dependencies {
     compileOnly gradleApi()
     compileOnly localGroovy()
-    compileOnly 'com.android.tools.build:gradle:3.4.0'
+    compileOnly 'com.android.tools.build:gradle:3.5.2'
 }
 
 publishing {

sentry-android-gradle-plugin/download-sentry-cli.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 cd $(dirname "$0")
 REPO=getsentry/sentry-cli
-VERSION=1.48.0
+VERSION=1.49.0
 PLATFORMS="Darwin-x86_64 Linux-i686 Linux-x86_64 Windows-i686"
 
 rm -f src/main/resources/bin/sentry-cli-*

sentry-android-gradle-plugin/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Sat Aug 26 15:11:09 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

sentry-android-gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -27,37 +27,47 @@ class SentryPlugin implements Plugin<Project> {
     static String getSentryCli(Project project) {
         // if a path is provided explicitly use that first
         def propertiesFile = "${project.rootDir.toPath()}/sentry.properties"
+        project.logger.info("propertiesFile: ${propertiesFile}")
+
         Properties sentryProps = new Properties()
         try {
             sentryProps.load(new FileInputStream(propertiesFile))
-        } catch (FileNotFoundException e) {
+        } catch (FileNotFoundException ignored) {
+            project.logger.error(ignored.getMessage())
             // it's okay, we can ignore it.
         }
 
         def rv = sentryProps.getProperty("cli.executable")
         if (rv != null) {
             return rv
+        } else {
+            project.logger.info("cli.executable is null")
         }
 
         // in case there is a version from npm right around the corner use that one.  This
         // is the case for react-native-sentry for instance
         def possibleExePaths = [
-            "${project.rootDir.toPath()}/../node_modules/@sentry/cli/bin/sentry-cli",
-            "${project.rootDir.toPath()}/../node_modules/sentry-cli-binary/bin/sentry-cli"
+                "${project.rootDir.toPath()}/../node_modules/@sentry/cli/bin/sentry-cli",
+                "${project.rootDir.toPath()}/../node_modules/sentry-cli-binary/bin/sentry-cli"
         ]
 
         possibleExePaths.each {
             if ((new File(it)).exists()) {
+                project.logger.info("possibleExePaths: ${it}")
                 return it
             }
             if ((new File(it + ".exe")).exists()) {
+                project.logger.info("possibleExePaths: ${it}.exe")
                 return it + ".exe"
             }
+            project.logger.info("possibleExePaths files dont exist")
         }
 
         // next up try a packaged version of sentry-cli
         def cliSuffix
         def osName = System.getProperty("os.name").toLowerCase()
+        project.logger.info("osName: ${osName}")
+
         if (osName.indexOf("mac") >= 0) {
             cliSuffix = "Darwin-x86_64"
         } else if (osName.indexOf("linux") >= 0) {
@@ -68,6 +78,8 @@ class SentryPlugin implements Plugin<Project> {
             cliSuffix = "Linux-" + arch
         } else if (osName.indexOf("win") >= 0) {
             cliSuffix = "Windows-i686.exe"
+        } else {
+            project.logger.info("cliSuffix not assigned")
         }
 
         if (cliSuffix != null) {
@@ -76,12 +88,21 @@ class SentryPlugin implements Plugin<Project> {
 
             // if we are not in a jar, we can use the file directly
             if ((new File(fsPath)).exists()) {
+                project.logger.info("fsPath: ${fsPath}")
                 return fsPath
+            } else {
+                project.logger.info("fsPath doesnt exist")
             }
 
             // otherwise we need to unpack into a file
             def resStream = SentryPlugin.class.getResourceAsStream(resPath)
             File tempFile = File.createTempFile(".sentry-cli", ".exe")
+            if (tempFile != null) {
+                project.logger.info("tempFile: ${tempFile.path}")
+            } else {
+                project.logger.info("tempFile is null")
+            }
+
             tempFile.deleteOnExit()
             def out = new FileOutputStream(tempFile)
             try {
@@ -122,9 +143,9 @@ class SentryPlugin implements Plugin<Project> {
      */
     static Task getDexTask(Project project, ApplicationVariant variant) {
         def names = [
-            "transformClassesWithDexFor${variant.name.capitalize()}",
-            "transformClassesWithDexBuilderFor${variant.name.capitalize()}",
-            "transformClassesAndDexWithShrinkResFor${variant.name.capitalize()}"
+                "transformClassesWithDexFor${variant.name.capitalize()}",
+                "transformClassesWithDexBuilderFor${variant.name.capitalize()}",
+                "transformClassesAndDexWithShrinkResFor${variant.name.capitalize()}"
         ]
 
         return names.findResult { project.tasks.findByName(it) } ?: project.tasks.findByName("dex${names[0]}")
@@ -149,41 +170,81 @@ class SentryPlugin implements Plugin<Project> {
      * @return
      */
     static String getDebugMetaPropPath(Project project, ApplicationVariant variant) {
+        try {
+            return variant.mergeAssetsProvider.get().outputDir.get().file("sentry-debug-meta.properties").getAsFile().path
+        } catch (Exception ignored) {
+            project.logger.error("getDebugMetaPropPath 1: ${ignored.getMessage()}")
+        }
+
         try {
             return variant.mergeAssets.outputDir.get().file("sentry-debug-meta.properties").getAsFile().path
-        } catch (Throwable ignored) {
-            return "${variant.mergeAssets.outputDir}/sentry-debug-meta.properties"
+        } catch (Exception ignored) {
+            project.logger.error("getDebugMetaPropPath 2: ${ignored.getMessage()}")
+        }
+
+        try {
+            return "${variant.mergeAssets.outputDir.get().asFile.path}/sentry-debug-meta.properties"
+        } catch (Exception ignored) {
+            project.logger.error("getDebugMetaPropPath 3: ${ignored.getMessage()}")
         }
 
+        try {
+            return "${variant.mergeAssets.outputDir}/sentry-debug-meta.properties"
+        } catch (Exception ignored) {
+            project.logger.error("getDebugMetaPropPath 4: ${ignored.getMessage()}")
+        }
     }
 
     void apply(Project project) {
         SentryPluginExtension extension = project.extensions.create("sentry", SentryPluginExtension)
 
         project.afterEvaluate {
-            if(!project.plugins.hasPlugin(AppPlugin) && !project.getPlugins().hasPlugin(LibraryPlugin)) {
+            if (!project.plugins.hasPlugin(AppPlugin) && !project.getPlugins().hasPlugin(LibraryPlugin)) {
                 throw new IllegalStateException('Must apply \'com.android.application\' first!')
             }
 
             project.android.applicationVariants.all { ApplicationVariant variant ->
                 variant.outputs.each { variantOutput ->
                     def manifestPath = extension.manifestPath
-
                     if (manifestPath == null) {
-                        def dir = findAndroidManifestFileDir(variantOutput)
+                        def dir = findAndroidManifestFileDir(project, variantOutput)
+                        if (dir != null) {
+                            project.logger.info("manifestDir: ${dir.path}")
+                        } else {
+                            project.logger.info("manifestDir is null")
+                        }
+
                         manifestPath = new File(new File(dir, variantOutput.dirName), "AndroidManifest.xml")
+                        project.logger.info("manifestPath: ${manifestPath}")
+                    } else {
+                        project.logger.info("manifestPath: ${manifestPath}")
                     }
 
                     def mappingFile = variant.getMappingFile()
                     def proguardTask = getProguardTask(project, variant)
+
                     def dexTask = getDexTask(project, variant)
+                    if (dexTask != null) {
+                        project.logger.info("dexTask ${dexTask.path}")
+                    } else {
+                        project.logger.info("dexTask is null")
+                    }
+
                     def bundleTask = getBundleTask(project, variant)
+                    if (bundleTask != null) {
+                        project.logger.info("bundleTask ${bundleTask.path}")
+                    } else {
+                        project.logger.info("bundleTask is null")
+                    }
 
                     if (proguardTask == null) {
+                        project.logger.info("proguardTask is null")
                         return
+                    } else {
+                        project.logger.info("proguardTask ${proguardTask.path}")
                     }
 
-                    // create a task to configure proguard automatically unless the user disabled it.
+//                     create a task to configure proguard automatically unless the user disabled it.
                     if (extension.autoProguardConfig) {
                         def addProguardSettingsTaskName = "addSentryProguardSettingsFor${variant.name.capitalize()}"
                         if (!project.tasks.findByName(addProguardSettingsTaskName)) {
@@ -243,15 +304,20 @@ class SentryPlugin implements Plugin<Project> {
 
                         if (propsFile != null) {
                             environment("SENTRY_PROPERTIES", propsFile)
+                        } else {
+                            project.logger.info("propsFile is null")
                         }
 
+                        def debugMetaPropPath = getDebugMetaPropPath(project, variant)
+                        project.logger.info("debugMetaPropPath: ${debugMetaPropPath}")
+
                         def args = [
                                 cli,
                                 "upload-proguard",
                                 "--android-manifest",
                                 manifestPath,
                                 "--write-properties",
-                                getDebugMetaPropPath(project, variant),
+                                debugMetaPropPath,
                                 mappingFile
                         ]
 
@@ -296,7 +362,7 @@ class SentryPlugin implements Plugin<Project> {
         }
     }
 
-    static File findAndroidManifestFileDir(BaseVariantOutput variantOutput) {
+    static File findAndroidManifestFileDir(Project project, BaseVariantOutput variantOutput) {
         // Gradle 4.7 introduced the lazy task API and AGP 3.3+ adopts that,
         // so we apparently have a Provider<File> here instead
         // TODO: This will let us depend on the configuration of each flavor's
@@ -307,14 +373,34 @@ class SentryPlugin implements Plugin<Project> {
 
         try { // Android Gradle Plugin >= 3.3.0
             return variantOutput.processManifestProvider.get().manifestOutputDirectory.get().asFile
-        } catch (Exception ignored) {}
+        } catch (Exception ignored) {
+            project.logger.error("findAndroidManifestFileDir 1: ${ignored.getMessage()}")
+        }
 
         try { // Android Gradle Plugin >= 3.0.0
             return variantOutput.processManifest.manifestOutputDirectory.get().asFile
-        } catch (Exception ignored) {}
+        } catch (Exception ignored) {
+            project.logger.error("findAndroidManifestFileDir 2: ${ignored.getMessage()}")
+        }
 
-        try { // Android Gradle Plugin < 3.0.0
+        // Android Gradle Plugin < 3.0.0
+        try {
             return new File(variantOutput.processManifest.manifestOutputFile).parentFile
-        } catch (Exception ignored) {}
+        } catch (Exception ignored) {
+            project.logger.error("findAndroidManifestFileDir 3: ${ignored.getMessage()}")
+        }
+
+        // https://github.com/Tencent/tinker/pull/620/files
+        try {
+            return variantOutput.processResourcesProvider.get().manifestFile.parentFile
+        } catch (Exception ignored) {
+            project.logger.error("findAndroidManifestFileDir 4: ${ignored.getMessage()}")
+        }
+
+        try {
+            return variantOutput.processResources.manifestFile.parentFile
+        } catch (Exception ignored) {
+            project.logger.error("findAndroidManifestFileDir 5: ${ignored.getMessage()}")
+        }
     }
 }