From e98f5f34ceeb201c58373669261fab1afe77dff1 Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 3 Feb 2021 17:36:18 +0000 Subject: [PATCH] Fix gradle conflict resolution for Cronet tests This resolves the following constraint resolution issue when running our release script: > Cannot find a version of 'org.chromium.net:cronet-api' that satisfies the version constraints: Dependency path 'com.google.android.exoplayer:extension-cronet:unspecified' --> 'com.google.android.gms:play-services-cronet:17.0.0' --> 'org.chromium.net:cronet-api:72.3626.96' Constraint path 'com.google.android.exoplayer:extension-cronet:unspecified' --> 'org.chromium.net:cronet-api:{strictly 72.3626.96}' because of the following reason: debugRuntimeClasspath uses version 72.3626.96 Dependency path 'com.google.android.exoplayer:extension-cronet:unspecified' --> 'org.chromium.net:cronet-embedded:76.3809.111' --> 'org.chromium.net:cronet-common:76.3809.111' --> 'org.chromium.net:cronet-api:76.3809.111' #minor-release PiperOrigin-RevId: 355414968 --- extensions/cronet/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle index 19526461ff..f50304fb94 100644 --- a/extensions/cronet/build.gradle +++ b/extensions/cronet/build.gradle @@ -28,9 +28,9 @@ dependencies { androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion - // Emulator tests assume that an app-packaged version of cronet is + // Instrumentation tests assume that an app-packaged version of cronet is // available. - androidTestImplementation 'org.chromium.net:cronet-embedded:76.3809.111' + androidTestImplementation 'org.chromium.net:cronet-embedded:72.3626.96' androidTestImplementation(project(modulePrefix + 'testutils')) testImplementation project(modulePrefix + 'library') testImplementation project(modulePrefix + 'testutils')