Merge pull request #856 from OneSignal/dependency_upgrade_robo_4.0

Updated dependencies and unittest for robolectric

Author: jkasten2

.travis.yml

@@ -10,12 +10,14 @@ android:
             # https://github.com/travis-ci/travis-ci/issues/6193
             # Required to get the newest platform-tools.
     - platform-tools
-    - build-tools-27.0.3
-    - android-27
+    - build-tools-28.0.3
+    - android-28
   licenses:
     - '.+'
+    - 'android-sdk-license-.+'
 before_install:
-    - yes | sdkmanager "platforms;android-27"
+    - yes | sdkmanager "platforms;android-28"
+    - yes | sdkmanager "build-tools;28.0.3"
     - pwd
     - ls -la
     - cd OneSignalSDK

OneSignalSDK/app/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.onesignal.androidsdk.onesignal-gradle-plugin' version '0.8.1'
+    id 'com.onesignal.androidsdk.onesignal-gradle-plugin' version '0.12.6'
 }
 apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
 

OneSignalSDK/build.gradle

@@ -11,9 +11,9 @@ buildscript {
 //      maven { url 'https://plugins.gradle.org/m2/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.5.0'
 
-        classpath 'com.google.gms:google-services:4.0.1'
+        classpath 'com.google.gms:google-services:4.3.2'
 
         // OneSignal-Gradle-Plugin - Local testing
         // classpath 'com.onesignal:onesignal-gradle-plugin:[0.8.1, 0.99.99]'

OneSignalSDK/gradle.properties

@@ -21,4 +21,18 @@
 # https://github.com/robolectric/robolectric/issues/3169
 #    org.robolectric.res.ResourceTableFactory.parseResourceFiles
 # Remove when creating an .aar build.
-android.enableAapt2=false
+#android.enableAapt2=false
+
+android.databinding.incremental = false
+kapt.incremental.apt = false
+android.testConfig.useRelativePath = false
+
+# Disables R8 for Android Library modules only
+android.enableR8.libraries = false
+# Disables R8 for all modules.
+android.enableR8 = true
+android.enableD8 = true
+
+# Android X settings
+android.enableJetifier = false
+android.useAndroidX = false

OneSignalSDK/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

OneSignalSDK/onesignal/build.gradle

@@ -1,24 +1,27 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
-
+    compileSdkVersion 28
     defaultConfig {
+        // Normally we shouldn't need to redefine manifestPlaceholders for our onesignal project
+        //   but Android Studio gets a sync error if these are not here.
+        //      - /gradlew onesignal:assembleRelease is fine from the console.
+        // We can't use static values are these are directly added to the AndroidManifest.xml in the .aar file.
+        manifestPlaceholders = [onesignal_app_id: '${onesignal_app_id}',
+                                // Project number pulled from dashboard, local value is ignored
+                                onesignal_google_project_number: '${onesignal_google_project_number}']
         minSdkVersion 15
         consumerProguardFiles 'consumer-proguard-rules.pro'
     }
 
     buildTypes {
-        main {
+        original {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-
         release {
             minifyEnabled false
         }
-
         unity {
             minifyEnabled false
         }
@@ -30,19 +33,18 @@ android {
 dependencies {
     compileOnly fileTree(dir: 'libs', include: ['*.jar'])
 
-    compileOnly 'com.google.android.gms:play-services-gcm:12.0.1'
-    api 'com.google.firebase:firebase-messaging:12.0.1'
-
+    compileOnly 'com.google.android.gms:play-services-gcm:16.0.0'
     // 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'
-
-    implementation 'com.android.support:cardview-v7:27.1.1'
-
+    implementation 'com.google.android.gms:play-services-location:16.0.0'
+    implementation 'com.google.android.gms:play-services-ads-identifier:16.0.0'
     // Required for GoogleApiAvailability
-    implementation 'com.google.android.gms:play-services-base:12.0.1'
+    implementation 'com.google.android.gms:play-services-base:16.0.1'
+
+    api 'com.google.firebase:firebase-messaging:17.3.3'
 
-    api 'com.android.support:support-v4:27.1.1'
-    api 'com.android.support:customtabs:27.1.1'
+    api 'com.android.support:cardview-v7:28.0.0'
+    api 'com.android.support:support-v4:28.0.0'
+    api 'com.android.support:customtabs:28.0.0'
 
     // Change api to implementation. Need to check however this has any effect in production
     //   projects that pull from maven.

OneSignalSDK/onesignal/maven-push.gradle

@@ -28,9 +28,9 @@ class Global {
 
     // Limit upper number (exclusive) to prevent untested versions
     static def versionGroupOverrides = [
-        'com.google.android.gms': '[10.2.1, 12.1.0)',
-        'com.google.firebase': '[10.2.1, 12.1.0)',
-        'com.android.support': '[26.0.0, 27.2.0)'
+        'com.google.android.gms': '[10.2.1, 16.1.0)',
+        'com.google.firebase': '[10.2.1, 16.1.0)',
+        'com.android.support': '[26.0.0, 28.1.0)'
     ]
 
     static def GROUP_ID = 'com.onesignal'

OneSignalSDK/onesignal/src/debug/AndroidManifest.xml

@@ -1,10 +1,12 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.onesignal">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.onesignal">
 
     <!-- Create a unique permission for your app and use it so only your app can receive your OneSignal messages. -->
     <permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature" />
     <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
 
     <application>
+
         <meta-data android:name="onesignal_app_id" android:value="${onesignal_app_id}" />
         <!-- Deprecated - Pulled from OneSignal dashboard. -->
         <meta-data android:name="onesignal_google_project_number" android:value="str:${onesignal_google_project_number}" />

OneSignalSDK/onesignal/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.onesignal">
 
     <!-- OneSignal SDK has runtime checks Android version. -->
@@ -61,6 +60,7 @@
     <!-- End: ShortcutBadger -->
 
     <application>
+
         <receiver android:name="com.onesignal.NotificationOpenedReceiver" />
 
         <service android:name="com.onesignal.GcmIntentService" />

OneSignalSDK/unittest/build.gradle

@@ -1,18 +1,17 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
-
+    compileSdkVersion 28
     defaultConfig {
         applicationId 'com.onesignal.example'
         manifestPlaceholders = [onesignal_app_id: 'b2f7f966-d8cc-11e4-bed1-df8f05be55ba',
-                                // Project number pulled from dashboard, local value is ignored.
+                                // Project number pulled from dashboard, local value is ignored
                                 onesignal_google_project_number: 'REMOTE']
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName '1.0'
+        testOptions.unitTests.includeAndroidResources = true
     }
     buildTypes {
         debug {
@@ -25,9 +24,6 @@ android {
             maxParallelForks 1
             maxHeapSize '2048m'
         }
-        unitTests {
-            includeAndroidResources = true
-        }
     }
 }
 
@@ -42,15 +38,15 @@ tasks.withType(Test) {
 dependencies {
     compileOnly fileTree(dir: 'libs', include: ['*.jar'])
 
-    // Use for SDK Development
+    // Use local onesignal SDK
     implementation(project(':onesignal'))
 
     // Required to shadow firebase analytics classes
-    implementation 'com.google.firebase:firebase-core:12.0.1'
+    implementation 'com.google.android.gms:play-services-location:16.0.0'
 
-    implementation 'com.google.android.gms:play-services-location:12.0.1'
+    implementation 'com.google.firebase:firebase-core:16.0.4'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:3.8'
-    testCompile 'org.awaitility:awaitility:3.1.5'
+    testImplementation 'org.robolectric:robolectric:4.0'
+    testImplementation 'org.awaitility:awaitility:3.1.5'
 }