Backport robolectric 3.1 from master to mnc-ub-dev

Change-Id: I8247febbb396dd1f75cb375937a270abf3bc61fb

28 files changed, 37 insertions, 16 deletions

diff --git a/MODULE_LICENSE_MIT b/MODULE_LICENSE_MIT
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/MODULE_LICENSE_MIT
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 000000000..c9dccb8d8
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2010 Xtreme Labs and Pivotal Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/v3/README.txt b/v3/README.txt
index b345f97df..d2c119706 100644
--- a/v3/README.txt
+++ b/v3/README.txt
@@ -3,7 +3,7 @@ Robolectric source code is distributed at https://github.com/robolectric/robolec
 #
 # Jars built from source
 #
-Robolectric commit sha1: 2c10ae67202575ca1534a2961c5afcaabe3a53fc
+Robolectric commit sha1: 582911a8ccb0b80c91640397fdc928522aac65d7
 
 Jars built from source:
 robolectric-*-3.0-SNAPSHOT.jar
diff --git a/v3/build.gradle b/v3/build.gradle
index 4dbff890b..3d150220b 100644
--- a/v3/build.gradle
+++ b/v3/build.gradle
@@ -36,5 +36,5 @@ dependencies {
     // runtime based on sdk version specified in test.
     compile files("runtime/android-all-5.0.0_r2-robolectric-1.jar")
     compile files("runtime/json-20080701.jar")
-    compile files("runtime/shadows-core-3.0-SNAPSHOT-21.jar")
+    compile files("runtime/shadows-core-3.1-SNAPSHOT-21.jar")
 }
diff --git a/v3/robolectric-3.0-SNAPSHOT.jar b/v3/robolectric-3.0-SNAPSHOT.jar
deleted file mode 100644
index 65ca8f847..000000000
--- a/v3/robolectric-3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/v3/robolectric-3.1-SNAPSHOT.jar b/v3/robolectric-3.1-SNAPSHOT.jar
new file mode 100644
index 000000000..71b89e2f1
--- /dev/null
+++ b/v3/robolectric-3.1-SNAPSHOT.jar
diff --git a/v3/robolectric-annotations-3.0-SNAPSHOT.jar b/v3/robolectric-annotations-3.0-SNAPSHOT.jar
deleted file mode 100644
index a57159ae5..000000000
--- a/v3/robolectric-annotations-3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/v3/robolectric-annotations-3.1-SNAPSHOT.jar b/v3/robolectric-annotations-3.1-SNAPSHOT.jar
new file mode 100644
index 000000000..8ed250dbb
--- /dev/null
+++ b/v3/robolectric-annotations-3.1-SNAPSHOT.jar
diff --git a/v3/robolectric-processor-3.0-SNAPSHOT.jar b/v3/robolectric-processor-3.0-SNAPSHOT.jar
deleted file mode 100644
index 9146f4471..000000000
--- a/v3/robolectric-processor-3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/v3/robolectric-processor-3.1-SNAPSHOT.jar b/v3/robolectric-processor-3.1-SNAPSHOT.jar
new file mode 100644
index 000000000..41e775aa9
--- /dev/null
+++ b/v3/robolectric-processor-3.1-SNAPSHOT.jar
diff --git a/v3/robolectric-resources-3.0-SNAPSHOT.jar b/v3/robolectric-resources-3.0-SNAPSHOT.jar
deleted file mode 100644
index 566252d36..000000000
--- a/v3/robolectric-resources-3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/v3/robolectric-resources-3.1-SNAPSHOT.jar b/v3/robolectric-resources-3.1-SNAPSHOT.jar
new file mode 100644
index 000000000..f97645e59
--- /dev/null
+++ b/v3/robolectric-resources-3.1-SNAPSHOT.jar
diff --git a/v3/robolectric-utils-3.0-SNAPSHOT.jar b/v3/robolectric-utils-3.0-SNAPSHOT.jar
deleted file mode 100644
index c3447446a..000000000
--- a/v3/robolectric-utils-3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/v3/robolectric-utils-3.1-SNAPSHOT.jar b/v3/robolectric-utils-3.1-SNAPSHOT.jar
new file mode 100644
index 000000000..bfd04c65d
--- /dev/null
+++ b/v3/robolectric-utils-3.1-SNAPSHOT.jar
diff --git a/v3/runtime/shadows-core-3.0-SNAPSHOT-16.jar b/v3/runtime/shadows-core-3.1-SNAPSHOT-16.jar
index 01d952ef8..67b28a46f 100644
--- a/v3/runtime/shadows-core-3.0-SNAPSHOT-16.jar
+++ b/v3/runtime/shadows-core-3.1-SNAPSHOT-16.jar
diff --git a/v3/runtime/shadows-core-3.0-SNAPSHOT-17.jar b/v3/runtime/shadows-core-3.1-SNAPSHOT-17.jar
index 47b788413..9d259f618 100644
--- a/v3/runtime/shadows-core-3.0-SNAPSHOT-17.jar
+++ b/v3/runtime/shadows-core-3.1-SNAPSHOT-17.jar
diff --git a/v3/runtime/shadows-core-3.0-SNAPSHOT-18.jar b/v3/runtime/shadows-core-3.1-SNAPSHOT-18.jar
index 999208dc3..135baf7cb 100644
--- a/v3/runtime/shadows-core-3.0-SNAPSHOT-18.jar
+++ b/v3/runtime/shadows-core-3.1-SNAPSHOT-18.jar
diff --git a/v3/runtime/shadows-core-3.0-SNAPSHOT-19.jar b/v3/runtime/shadows-core-3.1-SNAPSHOT-19.jar
index 261170a76..c6cdbb36e 100644
--- a/v3/runtime/shadows-core-3.0-SNAPSHOT-19.jar
+++ b/v3/runtime/shadows-core-3.1-SNAPSHOT-19.jar
diff --git a/v3/runtime/shadows-core-3.0-SNAPSHOT-21.jar b/v3/runtime/shadows-core-3.1-SNAPSHOT-21.jar
index 2b7ea1ce6..6ee4f04e2 100644
--- a/v3/runtime/shadows-core-3.0-SNAPSHOT-21.jar
+++ b/v3/runtime/shadows-core-3.1-SNAPSHOT-21.jar
diff --git a/v3/shadows-httpclient-3.0-SNAPSHOT.jar b/v3/shadows-httpclient-3.0-SNAPSHOT.jar
deleted file mode 100644
index 08795fff7..000000000
--- a/v3/shadows-httpclient-3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/v3/shadows-httpclient-3.1-SNAPSHOT.jar b/v3/shadows-httpclient-3.1-SNAPSHOT.jar
new file mode 100644
index 000000000..aef922c97
--- /dev/null
+++ b/v3/shadows-httpclient-3.1-SNAPSHOT.jar
diff --git a/v3/shadows-multidex-3.0-SNAPSHOT.jar b/v3/shadows-multidex-3.0-SNAPSHOT.jar
deleted file mode 100644
index 3ba04a2bd..000000000
--- a/v3/shadows-multidex-3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/v3/shadows-multidex-3.1-SNAPSHOT.jar b/v3/shadows-multidex-3.1-SNAPSHOT.jar
new file mode 100644
index 000000000..2c0c5dad9
--- /dev/null
+++ b/v3/shadows-multidex-3.1-SNAPSHOT.jar
diff --git a/v3/shadows-play-services-3.0-SNAPSHOT.jar b/v3/shadows-play-services-3.0-SNAPSHOT.jar
deleted file mode 100644
index a932d953f..000000000
--- a/v3/shadows-play-services-3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/v3/shadows-play-services-3.1-SNAPSHOT.jar b/v3/shadows-play-services-3.1-SNAPSHOT.jar
new file mode 100644
index 000000000..d88a543e5
--- /dev/null
+++ b/v3/shadows-play-services-3.1-SNAPSHOT.jar
diff --git a/v3/shadows-support-v4-3.0-SNAPSHOT.jar b/v3/shadows-support-v4-3.0-SNAPSHOT.jar
deleted file mode 100644
index 44ffa29c2..000000000
--- a/v3/shadows-support-v4-3.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/v3/shadows-support-v4-3.1-SNAPSHOT.jar b/v3/shadows-support-v4-3.1-SNAPSHOT.jar
new file mode 100644
index 000000000..d9f28b79c
--- /dev/null
+++ b/v3/shadows-support-v4-3.1-SNAPSHOT.jar
diff --git a/v3/update_robolectric.sh b/v3/update_robolectric.sh
index 7c90ecb82..60ef01171 100644..100755
--- a/v3/update_robolectric.sh
+++ b/v3/update_robolectric.sh
@@ -11,21 +11,21 @@
 MVN_ROOT=$HOME/.m2/repository
 ROBOLECTRIC_DIR=external/robolectric/v3
 
-cp $MVN_ROOT/org/robolectric/robolectric/3.0-SNAPSHOT/robolectric-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
-cp $MVN_ROOT/org/robolectric/robolectric-annotations/3.0-SNAPSHOT/robolectric-annotations-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
-cp $MVN_ROOT/org/robolectric/robolectric-processor/3.0-SNAPSHOT/robolectric-processor-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
-cp $MVN_ROOT/org/robolectric/robolectric-resources/3.0-SNAPSHOT/robolectric-resources-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
-cp $MVN_ROOT/org/robolectric/robolectric-utils/3.0-SNAPSHOT/robolectric-utils-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/robolectric/3.1-SNAPSHOT/robolectric-3.1-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/robolectric-annotations/3.1-SNAPSHOT/robolectric-annotations-3.1-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/robolectric-processor/3.1-SNAPSHOT/robolectric-processor-3.1-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/robolectric-resources/3.1-SNAPSHOT/robolectric-resources-3.1-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/robolectric-utils/3.1-SNAPSHOT/robolectric-utils-3.1-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
 
-cp $MVN_ROOT/org/robolectric/shadows-httpclient/3.0-SNAPSHOT/shadows-httpclient-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
-cp $MVN_ROOT/org/robolectric/shadows-support-v4/3.0-SNAPSHOT/shadows-support-v4-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
-cp $MVN_ROOT/org/robolectric/shadows-multidex/3.0-SNAPSHOT/shadows-multidex-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/shadows-httpclient/3.1-SNAPSHOT/shadows-httpclient-3.1-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/shadows-support-v4/3.1-SNAPSHOT/shadows-support-v4-3.1-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/shadows-multidex/3.1-SNAPSHOT/shadows-multidex-3.1-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
 
-cp $MVN_ROOT/org/robolectric/shadows-play-services/3.0-SNAPSHOT/shadows-play-services-3.0-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
+cp $MVN_ROOT/org/robolectric/shadows-play-services/3.1-SNAPSHOT/shadows-play-services-3.1-SNAPSHOT.jar $ROBOLECTRIC_DIR/.
 
-cp $MVN_ROOT/org/robolectric/shadows-core/3.0-SNAPSHOT/shadows-core-3.0-SNAPSHOT-16.jar $ROBOLECTRIC_DIR/runtime/.
-cp $MVN_ROOT/org/robolectric/shadows-core/3.0-SNAPSHOT/shadows-core-3.0-SNAPSHOT-17.jar $ROBOLECTRIC_DIR/runtime/.
-cp $MVN_ROOT/org/robolectric/shadows-core/3.0-SNAPSHOT/shadows-core-3.0-SNAPSHOT-18.jar $ROBOLECTRIC_DIR/runtime/.
-cp $MVN_ROOT/org/robolectric/shadows-core/3.0-SNAPSHOT/shadows-core-3.0-SNAPSHOT-19.jar $ROBOLECTRIC_DIR/runtime/.
-cp $MVN_ROOT/org/robolectric/shadows-core/3.0-SNAPSHOT/shadows-core-3.0-SNAPSHOT-21.jar $ROBOLECTRIC_DIR/runtime/.
+cp $MVN_ROOT/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT-16.jar $ROBOLECTRIC_DIR/runtime/.
+cp $MVN_ROOT/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT-17.jar $ROBOLECTRIC_DIR/runtime/.
+cp $MVN_ROOT/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT-18.jar $ROBOLECTRIC_DIR/runtime/.
+cp $MVN_ROOT/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT-19.jar $ROBOLECTRIC_DIR/runtime/.
+cp $MVN_ROOT/org/robolectric/shadows-core/3.1-SNAPSHOT/shadows-core-3.1-SNAPSHOT-21.jar $ROBOLECTRIC_DIR/runtime/.