Skip to content

Commit f9ae714

Browse files
authored
feat: Support R8 (#678)
* feat: Support R8
1 parent d333996 commit f9ae714

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
cd $(dirname "$0")
33
REPO=getsentry/sentry-cli
4-
VERSION=1.37.4
4+
VERSION=1.38.0
55
PLATFORMS="Darwin-x86_64 Linux-i686 Linux-x86_64 Windows-i686"
66

77
rm -f src/main/resources/bin/sentry-cli-*

sentry-android-gradle-plugin/src/main/groovy/io/sentry/android/gradle/SentryPlugin.groovy

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,21 @@ class SentryPlugin implements Plugin<Project> {
103103
* @return
104104
*/
105105
static Task getProguardTask(Project project, ApplicationVariant variant) {
106-
def name = "transformClassesAndResourcesWithProguardFor${variant.name.capitalize()}"
107-
def rv = project.tasks.findByName(name)
108-
if (rv != null) {
109-
return rv
106+
def names = [
107+
// Android Studio 3.3 includes the R8 shrinker.
108+
"transformClassesAndResourcesWithR8For${variant.name.capitalize()}",
109+
"transformClassesAndResourcesWithProguardFor${variant.name.capitalize()}"
110+
]
111+
112+
def rv = null
113+
names.each {
114+
rv = project.tasks.findByName(it)
115+
if (rv != null) {
116+
return rv
117+
}
110118
}
111-
return project.tasks.findByName("proguard${name}")
119+
120+
return project.tasks.findByName("proguard${names[1]}")
112121
}
113122

114123
/**

0 commit comments

Comments
 (0)