Release 7.5.4 (#298)

* [MOBILE-498] Force Java6 compatibility during CI

* [MOBILE-499] Provide a way to disable the google-services plugin

* Release 7.5.4

* Update iOS SDK to 10.2.2

CHANGELOG

@@ -1,3 +1,11 @@
+==============================
+Version 7.5.4 - April 19, 2019
+==============================
+- Added a gradle property `uaSkipApplyGoogleServicesPlugin` that will disable applying
+the `GoogleServicesPlugin` if set to `true`. This option should only be used if another
+plugin also applies the `GoogleServicesPlugin` to avoid build errors.
+- Updated Airship iOS SDK to 10.2.2
+
 ==============================
 Version 7.5.3 - March 14, 2019
 ==============================

README.md

@@ -141,6 +141,14 @@ In order to take advantage of iOS 10 notification attachments, such as images,
 animated gifs, and video, you will need to create a [notification service extension](https://developer.apple.com/reference/usernotifications/unnotificationserviceextension/)
 by following the [iOS Notification Service Extension Guide](https://docs.urbanairship.com/tutorials/api/ios/notification-service-extension/).
 
+### Android GoogleServicesPlugin
+
+The plugin will automatically apply the `GoogleServicesPlugin` for FCM. This can cause conflicts with other plugins that also apply
+the `GoogleServicesPlugin`. Applications can disable applying the plugin by setting the gradle property `uaSkipApplyGoogleServicesPlugin`
+to `true`. See (Setting Gradle Properties)[https://cordova.apache.org/docs/en/latest/guide/platforms/android/#setting-gradle-properties]
+for details on how to set a gradle property in a Cordova project.
+
+
 ### Sample
 
 A sample can be found in the Example directory.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "urbanairship-cordova",
-  "version": "7.5.3",
+  "version": "7.5.4",
   "description": "Urban Airship Cordova plugin",
   "cordova": {
     "id": "urbanairship-cordova",

plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin id="urbanairship-cordova"
-        version="7.5.3"
+        version="7.5.4"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -354,7 +354,7 @@
         <resource-file src="src/ios/Airship/AirshipResources.bundle"/>
 
         <!-- Airship library -->
-        <source-file framework="true" src="src/ios/Airship/libUAirship-10.2.0.a"/>
+        <source-file framework="true" src="src/ios/Airship/libUAirship-10.2.2.a"/>
 
         <!-- System frameworks -->
         <framework src="libsqlite3.dylib" />

scripts/run_ci_tasks.sh

@@ -67,7 +67,7 @@ if [ "$ANDROID" = "true" ]; then
   fi
 
   # Build android
-  cordova build android -- 2>&1 | tee -a /tmp/CORDOVA-$$.out
+  cordova build android -- ---gradleArg=-PuaInternalJava6CompileOptions=true 2>&1 | tee -a /tmp/CORDOVA-$$.out
 
   # check for failures
   if grep "BUILD FAILED" /tmp/CORDOVA-$$.out; then

src/android/build-extras.gradle

@@ -28,6 +28,20 @@ dependencies {
 
 ext.cdvCompileSdkVersion = 28
 
-cdvPluginPostBuildExtras.push({
-    apply plugin: com.google.gms.googleservices.GoogleServicesPlugin
-})
+// For CI only. Verify our plugin is Java 6 compatible
+if (project.hasProperty('uaInternalJava6CompileOptions') && uaInternalJava6CompileOptions.toBoolean()) {
+    cdvPluginPostBuildExtras.push({
+        android.compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_6
+            targetCompatibility JavaVersion.VERSION_1_6
+        }
+    })
+}
+
+// Used to avoid conflicts with other plugins that also apply the GoogleServicesPlugin
+// See https://cordova.apache.org/docs/en/latest/guide/platforms/android/#setting-gradle-properties
+if (!project.hasProperty('uaSkipApplyGoogleServicesPlugin') || !uaSkipApplyGoogleServicesPlugin) {
+    cdvPluginPostBuildExtras.push({
+        apply plugin: com.google.gms.googleservices.GoogleServicesPlugin
+    })
+}