Merge branch 'master' into parcelable-object

Author: natario1

CONTRIBUTING.md

@@ -26,15 +26,15 @@ In order to accept your pull request, we need you to submit a CLA. You only need
 Complete your CLA here: <https://developers.facebook.com/opensource/cla>
 
 ## Bugs
-Although we try to keep developing on Parse easy, you still may run into some issues. General questions should be asked on [Google Groups][google-group], technical questions should be asked on [Stack Overflow][stack-overflow], and for everything else we'll be using GitHub issues.
+Although we try to keep developing on Parse easy, you still may run into some issues. Technical questions should be asked on [Stack Overflow][stack-overflow], and for everything else we'll be using GitHub issues.
 
 ### Known Issues
 We use GitHub issues to track public bugs. We will keep a close eye on this and try to make it clear when we have an internal fix in progress. Before filing a new issue, try to make sure your problem doesn't already exist.
 
 ### Reporting New Issues
 Not all issues are SDK issues. If you're unsure whether your bug is with the SDK or backend, you can test to see if it reproduces with our [REST API][rest-api] and [Parse API Console][parse-api-console]. If it does, you can report backend bugs [here][bug-reports].
 
-To view the REST API network requests issued by the Parse SDK and responses from the Parse backend, please check out our [Network Debugging Tool][network-debugging-tool].  With this tool, you can either log network requests/responses to Android logcat, or log them to Chrome Debugger via Stetho.
+To view the REST API network requests issued by the Parse SDK and responses from the Parse backend, please check out [OkHttp Interceptors][network-debugging-tool].  With this tool, you can either log network requests/responses to Android logcat, or log them to Chrome Debugger via Stetho.
 
 Details are key. The more information you provide us the easier it'll be for us to debug and the faster you'll receive a fix. Some examples of useful tidbits:
 
@@ -56,11 +56,10 @@ We're still working on providing a code style for your IDE and getting a linter
 ## License
 By contributing to Parse Android SDK, you agree that your contributions will be licensed under its license.
 
- [google-group]: https://groups.google.com/forum/#!forum/parse-developers
  [stack-overflow]: http://stackoverflow.com/tags/parse.com
- [bug-reports]: https://www.parse.com/help#report
- [rest-api]: https://www.parse.com/docs/rest/guide
- [network-debugging-tool]: https://github.com/ParsePlatform/ParseInterceptors-Android/wiki
+ [bug-reports]: https://github.com/parse-community/parse-server
+ [rest-api]: http://docs.parseplatform.org/rest/guide/
+ [network-debugging-tool]: https://github.com/square/okhttp/wiki/Interceptors
  [parse-api-console]: http://blog.parse.com/announcements/introducing-the-parse-api-console/
  [stacktrace-or-gtfo]: http://i.imgur.com/jacoj.jpg
  [tests-dir]: /Parse/src/test/java/com/parse

LICENSE

@@ -28,3 +28,7 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-----
+
+As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code.

PATENTS

@@ -31,3 +31,7 @@ necessarily infringed by the Software standing alone.
 A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
 or contributory infringement or inducement to infringe any patent, including a
 cross-claim or counterclaim.
+
+-----
+
+As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code.

Parse/build.gradle

@@ -39,14 +39,22 @@ android {
     }
 }
 
-ext.okhttpVersion = '3.6.0'
+ext {
+    okhttpVersion = '3.6.0'
+}
+
 dependencies {
+    compile "com.android.support:support-annotations:$supportLibVersion"
     compile 'com.parse.bolts:bolts-tasks:1.4.0'
     compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
     provided 'com.facebook.stetho:stetho:1.4.2'
 
+    //Be aware, tests fail on 3.3.2 Wait to update until
+    //java.lang.NoClassDefFoundError: android/content/pm/VersionedPackage
+    //issue is fixed in Robolectric
+    //https://github.com/robolectric/robolectric/issues/2562
     testCompile 'org.robolectric:robolectric:3.3'
-    testCompile 'org.skyscreamer:jsonassert:1.4.0'
+    testCompile 'org.skyscreamer:jsonassert:1.5.0'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
 }
@@ -123,7 +131,7 @@ uploadArchives {
         pom.project {
             name 'Parse-Android'
             artifactId = 'parse-android'
-            packaging 'jar'
+            packaging 'aar'
             description 'A library that gives you access to the powerful Parse cloud platform from your Android app.'
             url 'https://github.com/ParsePlatform/Parse-SDK-Android'
 

Parse/src/main/java/com/parse/LocalIdManager.java

@@ -129,7 +129,7 @@ synchronized String createLocalId() {
 
     if (!isLocalId(localId)) {
       throw new IllegalStateException("Generated an invalid local id: \"" + localId + "\". "
-          + "This should never happen. Contact us at https://parse.com/help");
+          + "This should never happen. Open a bug at https://github.com/parse-community/parse-server");
     }
 
     return localId;