Bug 1308390 - Upgrade geckoview_example to support libraries 23.4 r?nalexander draft
authorAndrzej Hunt <ahunt@mozilla.com>
Fri, 07 Oct 2016 08:09:35 +0200
changeset 421987 379316c47297453623f86ea557200725582b7777
parent 421960 4b9944879c9a60a9aba4a744a7401bc38e0f39c4
child 533218 84658273ba52044e5b52d57ae45593b2116f8c34
push id31649
push userahunt@mozilla.com
push dateFri, 07 Oct 2016 06:10:02 +0000
reviewersnalexander
bugs1308390
milestone52.0a1
Bug 1308390 - Upgrade geckoview_example to support libraries 23.4 r?nalexander I've also updated espresso versions. For some reason using espress results in test-app defaulting to annotations 23.0.1 or 23.1.1 (depending on espresso version), but we can override this with the actual annotations library version to make gradle happy again. MozReview-Commit-ID: 6rFtvVgceJV
mobile/android/geckoview_example/build.gradle
--- a/mobile/android/geckoview_example/build.gradle
+++ b/mobile/android/geckoview_example/build.gradle
@@ -31,22 +31,23 @@ android {
             initWith debug
         }
     }
 }
 
 dependencies {
     testCompile 'junit:junit:4.12'
 
-    compile 'com.android.support:support-annotations:23.0.1'
+    compile 'com.android.support:support-annotations:23.4.0'
 
-    // Later versions (2.2.2, 0.5) requires newer support libraries, leading to
-    // "Conflict with dependency 'com.android.support:support-annotations'. Resolved versions for app (23.0.1) and test app (23.1.1) differ."
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
-    androidTestCompile 'com.android.support.test:runner:0.4.1'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+    androidTestCompile 'com.android.support.test:runner:0.5'
+    // Not defining this library again results in test-app assuming 23.1.1, and the following errors:
+    // "Conflict with dependency 'com.android.support:support-annotations'. Resolved versions for app (23.4.0) and test app (23.1.1) differ."
+    androidTestCompile 'com.android.support:support-annotations:23.4.0'
 
     compile project(':geckoview')
 }
 
 apply from: "${topsrcdir}/mobile/android/gradle/with_gecko_binaries.gradle"
 
 android.applicationVariants.all { variant ->
     // Like 'debug', 'release', or 'withoutGeckoBinaries'.