Add play-services-base required for Google API

* This is the GoogleApiAvailability class

Author: jkasten2

OneSignalSDK/onesignal/build.gradle

@@ -33,8 +33,12 @@ dependencies {
     compileOnly 'com.google.android.gms:play-services-gcm:12.0.1'
     api 'com.google.firebase:firebase-messaging:12.0.1'
 
+    // Can be compileOnly in 4.0.0, can't change until then as some projects may rely on this
     implementation 'com.google.android.gms:play-services-location:12.0.1'
 
+    // Required for GoogleApiAvailability
+    implementation 'com.google.android.gms:play-services-base:12.0.1'
+
     api 'com.android.support:support-v4:27.1.1'
     api 'com.android.support:customtabs:27.1.1'
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/GooglePlayServicesUpgradePrompt.java

@@ -12,16 +12,12 @@
 import static com.onesignal.OSUtils.getResourceString;
 
 class GooglePlayServicesUpgradePrompt {
-
-   private static final String GOOGLE_PLAY_SERVICES_PACKAGE_NAME = "com.google.android.gms";
-   private static final String GOOGLE_PLAY_STORE_PACKAGE_NAME = "com.android.vending";
-
    private static final int PLAY_SERVICES_RESOLUTION_REQUEST = 9000;
 
    static boolean isGMSInstalledAndEnabled() {
       try {
          PackageManager pm = OneSignal.appContext.getPackageManager();
-         PackageInfo info = pm.getPackageInfo(GOOGLE_PLAY_SERVICES_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
+         PackageInfo info = pm.getPackageInfo(GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE, PackageManager.GET_ACTIVITIES);
 
          return info.applicationInfo.enabled;
       } catch (PackageManager.NameNotFoundException e) {}
@@ -32,7 +28,7 @@ static boolean isGMSInstalledAndEnabled() {
    private static boolean isGooglePlayStoreInstalled() {
       try {
          PackageManager pm = OneSignal.appContext.getPackageManager();
-         PackageInfo info = pm.getPackageInfo(GOOGLE_PLAY_STORE_PACKAGE_NAME, PackageManager.GET_ACTIVITIES);
+         PackageInfo info = pm.getPackageInfo(GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE, PackageManager.GET_ACTIVITIES);
          String label = (String) info.applicationInfo.loadLabel(pm);
          return (label != null && !label.equals("Market"));
       } catch (Throwable e) {}