Skip to content
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.

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

Add a version check for bugsnag-android dependency #116

Merged
merged 5 commits into from
Jul 6, 2018
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@

## 3.2.8 (2018-06-21)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be TBD?


### Bug fixes

* Add a version check for bugsnag-android dependency, disabling redundant ProGuard config if >= v4.6.0
[Jamie Lynch](https://github.com/fractalwrench) [#116](https://github.com/bugsnag/bugsnag-android-gradle-plugin/pull/116)

## 3.2.8 (2018-06-21)

### Bug fixes
Expand Down
39 changes: 36 additions & 3 deletions src/main/groovy/com/bugsnag/android/gradle/BugsnagPlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import com.android.build.gradle.internal.dsl.BuildType
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.Dependency
import org.gradle.util.VersionNumber

/**
* Gradle plugin to automatically upload ProGuard mapping files to Bugsnag.
*
Expand All @@ -30,11 +34,15 @@ class BugsnagPlugin implements Plugin<Project> {
static final String BUILD_UUID_TAG = 'com.bugsnag.android.BUILD_UUID'
static final String GROUP_NAME = 'Bugsnag'

VersionNumber bugsnagVersionNumber

void apply(Project project) {
project.extensions.create("bugsnag", BugsnagPluginExtension)
project.bugsnag.extensions.create("sourceControl", SourceControl)

project.afterEvaluate {
bugsnagVersionNumber = getBugsnagAndroidVersionNumber(project)
project.logger.debug("Using bugsnag-android version number: $bugsnagVersionNumber")

// Make sure the android plugin has been applied first
if (project.plugins.hasPlugin(AppPlugin)) {
Expand All @@ -55,6 +63,26 @@ class BugsnagPlugin implements Plugin<Project> {
}
}

/**
* Retrieves the VersionNumber used by com.bugsnag.android in the given project. This can be used
* to conditionally perform tasks depending on the artefact version.
*/
static VersionNumber getBugsnagAndroidVersionNumber(Project project) {
List<Configuration> configs = project.configurations.collect()
List<Dependency> deps = configs.stream()
.map { conf -> conf.allDependencies }
.collect()
.flatten()

def bugsnagVersion = deps.stream()
.filter { dep -> return dep.group == "com.bugsnag" && dep.name == "bugsnag-android" }
.distinct()
.map({ dep -> return dep.version })
.findFirst()

return bugsnagVersion.present ? VersionNumber.parse(bugsnagVersion.get()) : VersionNumber.UNKNOWN
}

private static void setupNdkProject(Project project) {
def cleanTasks = project.tasks.findAll {
it.name.startsWith("externalNative") && it.name.contains("Clean")
Expand All @@ -76,7 +104,7 @@ class BugsnagPlugin implements Plugin<Project> {
* Create tasks for each Build Variant
* See https://sites.google.com/a/android.com/tools/tech-docs/new-build-system/user-guide#TOC-Build-Variants
*/
private static void applyBugsnagToVariant(BaseVariant variant, Project project) {
private void applyBugsnagToVariant(BaseVariant variant, Project project) {
if (hasDisabledBugsnag(variant)) {
return
}
Expand Down Expand Up @@ -213,14 +241,19 @@ class BugsnagPlugin implements Plugin<Project> {
* task is named `transformClassesAndResourcesWithProguardForRelease`
* as it is now part of the "transforms" process.
*/
private static void setupProguardAutoConfig(Project project, BaseVariant variant) {
private void setupProguardAutoConfig(Project project, BaseVariant variant) {
BugsnagProguardConfigTask proguardConfigTask = project.tasks.create("processBugsnag${taskNameForVariant(variant)}Proguard", BugsnagProguardConfigTask)
proguardConfigTask.group = GROUP_NAME
proguardConfigTask.variant = variant

if (project.bugsnag.autoProguardConfig) {
// consumer proguard rules were added to the library in 4.6.0
boolean hasConsumerRules = bugsnagVersionNumber.major >= 4 && bugsnagVersionNumber.minor >= 6

if (project.bugsnag.autoProguardConfig && !hasConsumerRules) {
project.logger.debug("Bugsnag autoproguard config enabled")
dependTaskOnPackageTask(variant, proguardConfigTask)
} else {
project.logger.debug("ProGuard has consumer rules, skipping write")
}
}

Expand Down