Skip to content

Commit

Permalink
Gradle plugin: Remove the version conflict check
Browse files Browse the repository at this point in the history
This check didn't work out as expected,
and caused more problems for us when updating Glean than it caught issues.

Now the consuming module need to ensure it uses a single version across all dependencies.
  • Loading branch information
badboy committed Aug 8, 2022
1 parent c887674 commit ec61a9d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* BUGFIX: Handle that Glean might be uninitialized when an upload task is requested ([#2131](https://github.com/mozilla/glean/pull/2131))
* Kotlin
* BUGFIX: When setting a local endpoint in testing check for testing mode, not initialization ([#2145](https://github.com/mozilla/glean/pull/2145/))
* Gradle plugin: Remove the version conflict check. Now the consuming module need to ensure it uses a single version across all dependencies ([#2143](https://github.com/mozilla/glean/pull/2143))

# v51.0.1 (2022-07-26)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -556,16 +556,6 @@ except:
}
because 'use GeckoView Glean instead of standalone Glean'
}

incoming.afterResolve {
resolutionResult.allComponents {
if (selectionReason.conflictResolution && moduleVersion != null) {
if (moduleVersion.group.contains("org.mozilla.telemetry") && moduleVersion.name.contains("glean")) {
throw new AssertionError("Cannot have a conflict on Glean ${selectionReason}")
}
}
}
}
}

if (project.android.hasProperty('applicationVariants')) {
Expand Down

0 comments on commit ec61a9d

Please sign in to comment.