Revert stripe-common gradle module

settings.gradle

@@ -1,4 +1,3 @@
-include ':stripe-common'
 include ':stripe'
 include ':example'
 include ':samplestore'

stripe/build.gradle

@@ -11,8 +11,6 @@ configurations {
 }
 
 dependencies {
-    implementation project(':stripe-common')
-
     implementation "com.android.support:support-annotations:28.0.0"
     implementation "com.android.support:appcompat-v7:28.0.0"
     implementation "com.android.support:recyclerview-v7:28.0.0"

stripe-common/src/main/java/com/stripe/android/model/ModelUtils.java → stripe/src/main/java/com/stripe/android/model/ModelUtils.java

@@ -1,7 +1,7 @@
 package com.stripe.android.model;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import java.util.Calendar;
 import java.util.Locale;
@@ -24,7 +24,7 @@ static boolean isWholePositiveNumber(@Nullable String value) {
     /**
      * Returns whether the given CharSequence contains only digits.
      */
-    private static boolean isDigitsOnly(@NotNull CharSequence str) {
+    private static boolean isDigitsOnly(@NonNull CharSequence str) {
         final int len = str.length();
         for (int cp, i = 0; i < len; i += Character.charCount(cp)) {
             cp = Character.codePointAt(str, i);
@@ -44,7 +44,7 @@ private static boolean isDigitsOnly(@NotNull CharSequence str) {
      * @return {@code true} if the input time has passed the specified current time,
      *  {@code false} otherwise.
      */
-    static boolean hasMonthPassed(int year, int month, @NotNull Calendar now) {
+    static boolean hasMonthPassed(int year, int month, @NonNull Calendar now) {
         if (hasYearPassed(year, now)) {
             return true;
         }
@@ -62,12 +62,12 @@ static boolean hasMonthPassed(int year, int month, @NotNull Calendar now) {
      * @return {@code true} if the input year has passed the year of the specified current time
      *  {@code false} otherwise.
      */
-    static boolean hasYearPassed(int year, @NotNull Calendar now) {
+    static boolean hasYearPassed(int year, @NonNull Calendar now) {
         int normalized = normalizeYear(year, now);
         return normalized < now.get(Calendar.YEAR);
     }
 
-    static int normalizeYear(int year, @NotNull Calendar now)  {
+    static int normalizeYear(int year, @NonNull Calendar now)  {
         if (year < 100 && year >= 0) {
             String currentYear = String.valueOf(now.get(Calendar.YEAR));
             String prefix = currentYear.substring(0, currentYear.length() - 2);

stripe-common/src/main/java/com/stripe/android/utils/ClassUtils.java → stripe/src/main/java/com/stripe/android/utils/ClassUtils.java

@@ -1,7 +1,7 @@
 package com.stripe.android.utils;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -18,8 +18,8 @@ private ClassUtils() {}
      * @return  the value of the found field, if exists, on the target object, or null
      */
     @Nullable
-    public static Object getInternalObject(@NotNull Class clazz, @NotNull Set<String> whitelist,
-                                           @NotNull Object obj) {
+    public static Object getInternalObject(@NonNull Class clazz, @NonNull Set<String> whitelist,
+                                           @NonNull Object obj) {
         final Field field = findField(clazz, whitelist);
         if (field == null) {
             return null;
@@ -41,7 +41,7 @@ public static Object getInternalObject(@NotNull Class clazz, @NotNull Set<String
      */
     @SuppressWarnings("WeakerAccess")
     @Nullable
-    public static Field findField(@NotNull Class clazz, @NotNull Collection<String> whitelist) {
+    public static Field findField(@NonNull Class clazz, @NonNull Collection<String> whitelist) {
         final Field[] fields = clazz.getDeclaredFields();
         for (Field field : fields) {
             if (whitelist.contains(field.getName())) {
@@ -58,7 +58,7 @@ public static Field findField(@NotNull Class clazz, @NotNull Collection<String>
      * @return the {@link Method} if one is found, otherwise null
      */
     @Nullable
-    public static Method findMethod(@NotNull Class clazz, @NotNull Collection<String> whitelist) {
+    public static Method findMethod(@NonNull Class clazz, @NonNull Collection<String> whitelist) {
         final Method[] methods = clazz.getDeclaredMethods();
         for (Method method : methods) {
             if (whitelist.contains(method.getName())) {

stripe-common/src/main/java/com/stripe/android/utils/ObjectUtils.java → stripe/src/main/java/com/stripe/android/utils/ObjectUtils.java

@@ -1,6 +1,6 @@
 package com.stripe.android.utils;
 
-import org.jetbrains.annotations.Nullable;
+import android.support.annotation.Nullable;
 
 import java.util.Arrays;
 

stripe-common/src/test/java/com/stripe/android/utils/ClassUtilsTest.java → stripe/src/test/java/com/stripe/android/utils/ClassUtilsTest.java

@@ -26,7 +26,7 @@ public void testfindField_withValidWhitelist_shouldReturnField() {
 
     @Test
     public void testfindField_withEmptyWhitelist_shouldReturnNull() {
-        final Field nameField = ClassUtils.findField(FakeClass.class, new HashSet<>());
+        final Field nameField = ClassUtils.findField(FakeClass.class, new HashSet<String>());
         assertNull(nameField);
     }