Skip to content

feat: Support R8 #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 5, 2019
Merged

feat: Support R8 #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8db2252
feat: Support R8
bruno-garcia Feb 5, 2019
3a203aa
dep: depend on sentry-cli supporting R8
bruno-garcia Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sentry-android-gradle-plugin/download-sentry-cli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-*
Expand Down
19 changes: 14 additions & 5 deletions sentry-android-gradle-plugin/src/main/groovy/io/sentry/android/gradle/SentryPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,21 @@ class SentryPlugin implements Plugin<Project> {
* @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]}")
}

/**
Expand Down