Skip to content

Commit

Permalink
Remove hack in #621 as no longer needed
Browse files Browse the repository at this point in the history
Signed-off-by: Songlin Jiang <sjiang@igalia.com>
  • Loading branch information
HollowMan6 committed Jul 12, 2023
1 parent 3d91db6 commit 046b6ba
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -640,18 +640,6 @@ dependencies {
geckoImplementation deps.gecko_view."${branch}_x86_64"
geckoImplementation deps.gecko_view."${branch}_arm64"
configurations.all {
// TODO(jfernandez): Instead of solving the conflicts this way, we would need to determine which packages
// are the culprit and define their dependencies so that we can let gradle to resolve them automatically.
// See https://docs.gradle.org/current/userguide/dependency_resolution.html for details.
resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'org.jetbrains.kotlin'
&& details.requested.name.contains('kotlin-stdlib')) {
details.useVersion '1.4.10';
} else if (details.requested.group == 'org.jetbrains.kotlinx'
&& details.requested.name.contains('coroutines')) {
details.useVersion '1.4.2'
}
}
resolutionStrategy.capabilitiesResolution.withCapability('org.mozilla.geckoview:geckoview') {
def abi = getName().toLowerCase().contains('x86_64') ? 'x86_64' : 'arm64'
def candidate = "geckoview-${branch}-${abi}"
Expand Down

0 comments on commit 046b6ba

Please sign in to comment.