aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Williams <christianw@google.com>2017-07-13 15:51:00 -0700
committerChristian Williams <christianw@google.com>2017-07-13 15:55:56 -0700
commit4f212f8661cc36fad1ecc4778543f77331ec5aab (patch)
tree505e605d5df6287931c7204ae29d75794c53468b
parent37b02e8202a1a807cfe49ab41c501d0a603a4759 (diff)
downloadrobolectric-shadows-4f212f8661cc36fad1ecc4778543f77331ec5aab.tar.gz
Need to bump android stubs to 26 because of ShortcutManager shadow.
-rw-r--r--.travis.yml1
-rw-r--r--integration-tests/dependency-on-stubs/build.gradle2
-rwxr-xr-xscripts/install-dependencies.rb2
3 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index b659e32b0..bec28d0ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ android:
- platform-tools
- build-tools-23.0.3
- android-23
+ - android-26
- extra-google-m2repository
- extra-android-m2repository
- addon-google_apis-google-23
diff --git a/integration-tests/dependency-on-stubs/build.gradle b/integration-tests/dependency-on-stubs/build.gradle
index acfd6a715..31dd3b2bd 100644
--- a/integration-tests/dependency-on-stubs/build.gradle
+++ b/integration-tests/dependency-on-stubs/build.gradle
@@ -9,7 +9,7 @@ apply plugin: RoboJavaModulePlugin
dependencies {
compile project(":robolectric")
compile "junit:junit:4.12"
- testCompile "com.google.android:android-stubs:23"
+ testCompile "com.google.android:android-stubs:26"
// Testing dependencies
testCompile "org.assertj:assertj-core:3.8.0"
diff --git a/scripts/install-dependencies.rb b/scripts/install-dependencies.rb
index d17411e7f..a625f400c 100755
--- a/scripts/install-dependencies.rb
+++ b/scripts/install-dependencies.rb
@@ -161,7 +161,7 @@ MAPS_REVISION_VERSION = "1"
# Mavenize all dependencies
-install_stubs(23)
+install_stubs(26)
install_map(MAPS_GROUP_ID, MAPS_ARTIFACT_ID, MAPS_API_VERSION, MAPS_REVISION_VERSION)