Modify package to allow for clean package for com.parse

Author: Jawnnypoo

README.md

@@ -1,42 +1,50 @@
 # Parse Twitter Utils for Android
 [![Build Status][build-status-svg]][build-status-link]
 [![Coverage Status][coverage-status-svg]][coverage-status-link]
-[![Maven Central][maven-svg]][maven-link]
 [![License][license-svg]][license-link]
 
-A utility library to authenticate `ParseUser`s with Twitter. For more information, see our [guide][guide].
+A utility library to authenticate `ParseUser`s with Twitter.
 
-## Download
-Download [the latest JAR][latest] or define in Gradle:
+## Dependency
 
-```groovy
-dependencies {
-  compile 'com.parse:parsetwitterutils-android:1.10.6'
-}
-```
-
-Snapshots of the development version are available in [Sonatype's `snapshots` repository][snap].
-
-## Usage
-Everything can done through the supplied gradle wrapper:
+Add this in your root `build.gradle` file (**not** your module `build.gradle` file):
 
-### Compile a JAR
-```
-./gradlew clean jarRelease
+```gradle
+allprojects {
+	repositories {
+		...
+		maven { url "https://jitpack.io" }
+	}
+}
 ```
-Outputs can be found in `Parse/build/libs/`
 
-### Run the Tests
-```
-./gradlew clean testDebug
+Then, add the library to your project `build.gradle`
+```gradle
+dependencies {
+    implementation 'com.github.parse-community:ParseTwitterUtils-Android:latest.version.here'
+}
 ```
-Results can be found in `Parse/build/reports/`
 
-### Get Code Coverage Reports
+## Usage
+Extensive docs can be found in the [guide][guide]. The basic steps are:
+```java
+ParseTwitterUtils.initialize("YOUR CONSUMER KEY", "YOUR CONSUMER SECRET");
 ```
-./gradlew clean jacocoTestReport
+Then later, when your user taps the login button:
+```java
+ParseTwitterUtils.logIn(this, new LogInCallback() {
+  @Override
+  public void done(ParseUser user, ParseException err) {
+    if (user == null) {
+      Log.d("MyApp", "Uh oh. The user cancelled the Twitter login.");
+    } else if (user.isNew()) {
+      Log.d("MyApp", "User signed up and logged in through Twitter!");
+    } else {
+      Log.d("MyApp", "User logged in through Twitter!");
+    }
+  }
+});
 ```
-Results can be found in `Parse/build/reports/`
 
 ## How Do I Contribute?
 We want to make contributing to this project as easy and transparent as possible. Please refer to the [Contribution Guidelines](CONTRIBUTING.md).

build.gradle

@@ -9,6 +9,10 @@ buildscript {
     }
 }
 
+plugins {
+    id 'com.github.ben-manes.versions' version '0.20.0'
+}
+
 allprojects {
     repositories {
         google()

library/src/main/java/com/parse/ParseTwitterUtils.java renamed to library/src/main/java/com/parse/twitter/ParseTwitterUtils.java

@@ -28,9 +28,9 @@ public final class ParseTwitterUtils {
   private static final String CALLBACK_URL = "twittersdk://";
 
   private static final Object lock = new Object();
-  /* package for tests */ static boolean isInitialized;
-  /* package for tests */ static TwitterController controller;
-  /* package for tests */ static ParseUserDelegate userDelegate = new ParseUserDelegateImpl();
+  static boolean isInitialized;
+  static TwitterController controller;
+  static ParseUserDelegate userDelegate = new ParseUserDelegateImpl();
 
   private static TwitterController getTwitterController() {
     synchronized (lock) {
@@ -467,7 +467,7 @@ private ParseTwitterUtils() {
     // do nothing
   }
 
-  /* package for tests */ interface ParseUserDelegate {
+  interface ParseUserDelegate {
     void registerAuthenticationCallback(String authType, AuthenticationCallback callback);
     Task<ParseUser> logInWithInBackground(String authType, Map<String, String> authData);
   }

library/src/main/java/com/parse/twitter/Twitter.java

@@ -13,9 +13,9 @@
 import android.os.AsyncTask;
 import android.webkit.CookieSyncManager;
 
-import com.parse.oauth.OAuth1FlowDialog;
-import com.parse.oauth.OAuth1FlowDialog.FlowResultHandler;
-import com.parse.oauth.OAuth1FlowException;
+import com.parse.twitter.oauth.OAuth1FlowDialog;
+import com.parse.twitter.oauth.OAuth1FlowDialog.FlowResultHandler;
+import com.parse.twitter.oauth.OAuth1FlowException;
 
 import oauth.signpost.http.HttpParameters;
 import okhttp3.HttpUrl;
@@ -24,9 +24,9 @@
 
 public class Twitter {
 
-  static final String REQUEST_TOKEN_URL = "https://api.twitter.com/oauth/request_token";
-  static final String AUTHORIZE_URL = "https://api.twitter.com/oauth/authenticate";
-  static final String ACCESS_TOKEN_URL = "https://api.twitter.com/oauth/access_token";
+  private static final String REQUEST_TOKEN_URL = "https://api.twitter.com/oauth/request_token";
+  private static final String AUTHORIZE_URL = "https://api.twitter.com/oauth/authenticate";
+  private static final String ACCESS_TOKEN_URL = "https://api.twitter.com/oauth/access_token";
 
   private static final String VERIFIER_PARAM = "oauth_verifier";
   private static final String USER_ID_PARAM = "user_id";

library/src/main/java/com/parse/TwitterController.java renamed to library/src/main/java/com/parse/twitter/TwitterController.java

@@ -18,7 +18,7 @@
 
 import bolts.Task;
 
-/** package */ class TwitterController {
+class TwitterController {
 
   private static final String CONSUMER_KEY_KEY = "consumer_key";
   private static final String CONSUMER_SECRET_KEY = "consumer_secret";

library/src/main/java/com/parse/internal/gdata/Escaper.java renamed to library/src/main/java/com/parse/twitter/gdata/Escaper.java

@@ -14,7 +14,7 @@
  */
 
 
-package com.parse.internal.gdata;
+package com.parse.twitter.gdata;
 
 /**
  * An object that converts literal text into a format safe for inclusion in a

library/src/main/java/com/parse/internal/gdata/PercentEscaper.java renamed to library/src/main/java/com/parse/twitter/gdata/PercentEscaper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.parse.internal.gdata;
+package com.parse.twitter.gdata;
 
 import java.util.NoSuchElementException;
 

library/src/main/java/com/parse/internal/gdata/Preconditions.java renamed to library/src/main/java/com/parse/twitter/gdata/Preconditions.java

@@ -14,9 +14,9 @@
  */
 
 
-package com.parse.internal.gdata;
+package com.parse.twitter.gdata;
 
-import static com.parse.internal.gdata.Preconditions.checkNotNull;
+import static com.parse.twitter.gdata.Preconditions.checkNotNull;
 
 import java.io.IOException;
 
@@ -252,7 +252,7 @@ protected final String escapeSlow(String s, int index) {
    *
    */
   public Appendable escape(final Appendable out) {
-    checkNotNull(out);
+    Preconditions.checkNotNull(out);
 
     return new Appendable() {
       int pendingHighSurrogate = -1;