WIP cordova sdk 17

urbanairship · Sep 5, 2023 · 3608dc7 · 3608dc7
1 parent ec6c861
commit 3608dc7
Show file tree

Hide file tree

Showing 24 changed files with 2,199 additions and 382 deletions.
diff --git a/config_sample.xml b/config_sample.xml
@@ -46,8 +46,8 @@
 <!-- If the app is in production or not -->
 <preference name="com.urbanairship.in_production" value="false" />
 
-<!-- Deployment target must be >= iOS 11  -->
-<preference name="deployment-target" value="11.0" />
+<!-- Deployment target must be >= iOS 14  -->
+<preference name="deployment-target" value="14.0" />
 
 <!-- Optional config values -->
 <!-- Enable push when the application launches -->

diff --git a/package.json b/package.json
@@ -14,9 +14,7 @@
     "build-ios": "cd ../cordova-sample/test; cordova build ios",
     "run-android": "cd ../cordova-sample/test; cordova run android",
     "run-ios": "cd ../cordova-sample/test; cordova run ios",
-    "add-accengage-module": "cd ../cordova-sample/test; cordova plugin add ../../urbanairship-cordova/urbanairship-accengage-cordova",
-    "remove-accengage-module": "cd ../cordova-sample/test; cordova plugin rm urbanairship-accengage-cordova",
     "add-hms-module": "cd ../cordova-sample/test; cordova plugin add ../../urbanairship-cordova/urbanairship-hms-cordova",
     "remove-hms-module": "cd ../cordova-sample/test; cordova plugin rm urbanairship-hms-cordova"
   }
-}
+}
diff --git a/scripts/create_sample.sh b/scripts/create_sample.sh
@@ -5,7 +5,6 @@ set -euxo pipefail
 cd `dirname "${0}"`/../
 ROOT_PATH="$(pwd)"
 CORDOVA_AIRSHIP_MODULE="$ROOT_PATH/urbanairship-cordova"
-CORDOVA_AIRSHIP_ACCENGAGE_MODULE="$ROOT_PATH/urbanairship-accengage-cordova"
 CORDOVA_AIRSHIP_HMS_MODULE="$ROOT_PATH/urbanairship-hms-cordova"
 cd -
 
@@ -38,7 +37,6 @@ npm install cordova@$CORDOVA_VERSION
 
 # add the plugins
 npx cordova plugin add $CORDOVA_AIRSHIP_MODULE
-npx cordova plugin add $CORDOVA_AIRSHIP_ACCENGAGE_MODULE
 npx cordova plugin add $CORDOVA_AIRSHIP_HMS_MODULE
 
 # copy config and example files

diff --git a/urbanairship-cordova/package.json b/urbanairship-cordova/package.json
@@ -1,6 +1,6 @@
 {
   "name": "urbanairship-cordova",
-  "version": "14.10.1",
+  "version": "15.0.0",
   "description": "Urban Airship Cordova plugin",
   "cordova": {
     "id": "urbanairship-cordova",

diff --git a/urbanairship-cordova/plugin.xml b/urbanairship-cordova/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin id="urbanairship-cordova"
-        version="14.10.1"
+        version="15.0.0"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -40,7 +40,7 @@
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <meta-data
                 android:name="com.urbanairship.cordova.version"
-                android:value="14.10.1"/>
+                android:value="15.0.0"/>
 
             <meta-data
                 android:name="com.urbanairship.autopilot"
@@ -137,6 +137,8 @@
     <!-- ios -->
     <platform name="ios">
 
+        <dependency id="cordova-plugin-add-swift-support" version="2.0.2"/>
+
         <!-- Background push -->
         <config-file parent="UIBackgroundModes" target="*-Info.plist">
             <array>
@@ -145,7 +147,7 @@
         </config-file>
 
         <config-file target="*-Info.plist" parent="UACordovaPluginVersion">
-            <string>14.10.1</string>
+            <string>15.0.0</string>
         </config-file>
 
         <config-file parent="/widget" target="config.xml">
@@ -191,18 +193,15 @@
         <source-file src="src/ios/events/UACordovaShowInboxEvent.m"/>
         <header-file src="src/ios/events/UACordovaPreferenceCenterEvent.h"/>
         <source-file src="src/ios/events/UACordovaPreferenceCenterEvent.m"/>
+        <source-file src="src/ios/AirshipCordova.swift"/>
 
         <!-- Airship library -->
         <podspec>
             <config>
                 <source url="https://cdn.cocoapods.org/"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="Airship/Core" spec="16.12.1" />
-                <pod name="Airship/MessageCenter" spec="16.12.1" />
-                <pod name="Airship/Automation" spec="16.12.1" />
-                <pod name="Airship/ExtendedActions" spec="16.12.1" />
-                <pod name="Airship/PreferenceCenter" spec="16.12.1" />
+                <pod name="AirshipFrameworkProxy" spec="2.0.3" />
             </pods>
         </podspec>
 

diff --git a/urbanairship-cordova/src/android/build-extras.gradle b/urbanairship-cordova/src/android/build-extras.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    def airshipVersion = "16.11.1"
+    def airshipVersion = "17.1.0"
     implementation "com.urbanairship.android:urbanairship-fcm:$airshipVersion"
     implementation "com.urbanairship.android:urbanairship-message-center:$airshipVersion"
     implementation "com.urbanairship.android:urbanairship-automation:$airshipVersion"