From 8db22527018df497cdde44d241b4a744c64f015f Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Tue, 5 Feb 2019 12:28:02 +0100 Subject: [PATCH 1/2] feat: Support R8 --- .../sentry/android/gradle/SentryPlugin.groovy | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sentry-android-gradle-plugin/src/main/groovy/io/sentry/android/gradle/SentryPlugin.groovy b/sentry-android-gradle-plugin/src/main/groovy/io/sentry/android/gradle/SentryPlugin.groovy index 8dc1c6fe6de..5b5ce286a6e 100644 --- a/sentry-android-gradle-plugin/src/main/groovy/io/sentry/android/gradle/SentryPlugin.groovy +++ b/sentry-android-gradle-plugin/src/main/groovy/io/sentry/android/gradle/SentryPlugin.groovy @@ -103,12 +103,21 @@ class SentryPlugin implements Plugin { * @return */ static Task getProguardTask(Project project, ApplicationVariant variant) { - def name = "transformClassesAndResourcesWithProguardFor${variant.name.capitalize()}" - def rv = project.tasks.findByName(name) - if (rv != null) { - return rv + def names = [ + // Android Studio 3.3 includes the R8 shrinker. + "transformClassesAndResourcesWithR8For${variant.name.capitalize()}", + "transformClassesAndResourcesWithProguardFor${variant.name.capitalize()}" + ] + + def rv = null + names.each { + rv = project.tasks.findByName(it) + if (rv != null) { + return rv + } } - return project.tasks.findByName("proguard${name}") + + return project.tasks.findByName("proguard${names[1]}") } /** From 3a203aae614be4e9be928f8913f3ad7eeaec649b Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Tue, 5 Feb 2019 16:50:41 +0100 Subject: [PATCH 2/2] dep: depend on sentry-cli supporting R8 --- sentry-android-gradle-plugin/download-sentry-cli.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-android-gradle-plugin/download-sentry-cli.sh b/sentry-android-gradle-plugin/download-sentry-cli.sh index e2d86ee3a03..bc99d90ae78 100755 --- a/sentry-android-gradle-plugin/download-sentry-cli.sh +++ b/sentry-android-gradle-plugin/download-sentry-cli.sh @@ -1,7 +1,7 @@ #!/bin/bash cd $(dirname "$0") REPO=getsentry/sentry-cli -VERSION=1.37.4 +VERSION=1.38.0 PLATFORMS="Darwin-x86_64 Linux-i686 Linux-x86_64 Windows-i686" rm -f src/main/resources/bin/sentry-cli-*