Merge pull request #422 from MaximBelov/failed-to-restore-plugin

fix: Failed to restore plugin "cordova-airship"
urbanairship · Mar 25, 2024 · 8a3f7b1 · 8a3f7b1
2 parents 3390abe + 3285f14
commit 8a3f7b1
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/MIGRATION.md b/MIGRATION.md
@@ -32,8 +32,8 @@ The npm packages are now published under new names:
 
 | 14.x                           | 15.x                    | Notes                                                                                            |
 |--------------------------------|-------------------------|--------------------------------------------------------------------------------------------------|
-| urbanairship-cordova           | @ua/cordova-airship     | The plugin id is `cordova-airship`.                                                              |
-| urbanairship-cordova-hms       | @ua/cordova-airhsip-hms | The plugin id is `cordova-airship-hms`.                                                          |
+| urbanairship-cordova           | @ua/cordova-airship     | The plugin id is `@ua/cordova-airship`.                                                              |
+| urbanairship-cordova-hms       | @ua/cordova-airship-hms | The plugin id is `@ua/cordova-airship-hms`.                                                          |
 | urbanairship-accengage-cordova | removed                 | Package is no longer needed. It was only needed during the transition from Accengage to Airship. |
 
 

diff --git a/cordova-airship-hms/package.json b/cordova-airship-hms/package.json
@@ -3,7 +3,7 @@
   "version": "15.0.0",
   "description": "Airship HMS Cordova plugin",
   "cordova": {
-    "id": "cordova-airship-hms",
+    "id": "@ua/cordova-airship-hms",
     "platforms": [
       "android"
     ]

diff --git a/cordova-airship-hms/plugin.xml b/cordova-airship-hms/plugin.xml
@@ -15,7 +15,7 @@
         <engine name="cordova" version=">=9.0.1"/>
     </engines>
 
-    <dependency id="cordova-airship" version="15.0.0"/>
+    <dependency id="@ua/cordova-airship" version="15.0.0"/>
 
     <!-- android -->
     <platform name="android">

diff --git a/cordova-airship/package.json b/cordova-airship/package.json
@@ -3,7 +3,7 @@
   "version": "15.0.0",
   "description": "Airship Cordova plugin",
   "cordova": {
-    "id": "airship-cordova",
+    "id": "@ua/cordova-airship",
     "platforms": [
       "android",
       "ios"

diff --git a/cordova-airship/plugin.xml b/cordova-airship/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin id="cordova-airship"
+<plugin id="@ua/cordova-airship"
         version="15.0.0"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">

diff --git a/scripts/check_plugin_version.sh b/scripts/check_plugin_version.sh
@@ -21,7 +21,7 @@ echo "android: $androidVersion"
 iosVersion=$(grep "static let version" $IOS_VERISON_PATH | awk -F'"' '{print $2}')
 echo "ios: $iosVersion"
 
-hmsDependencyVersion=$(grep '<dependency id="cordova-airship"' $HMS_PLUGIN_XML_PATH | awk -F 'version="' '{print $2}' | awk -F '"' '{print $1}')
+hmsDependencyVersion=$(grep '<dependency id="@ua/cordova-airship"' $HMS_PLUGIN_XML_PATH | awk -F 'version="' '{print $2}' | awk -F '"' '{print $1}')
 echo "hms core dependency: $hmsDependencyVersion"
 
 if [ "$coreVersion" = "$hmsVersion" ] && [ "$coreVersion" = "$androidVersion" ] && [ "$coreVersion" = "$iosVersion" ] && [ "$coreVersion" = "$hmsDependencyVersion" ]; then

diff --git a/scripts/update_version.sh b/scripts/update_version.sh
@@ -18,6 +18,6 @@ fi
 
 sed -i '' "s/var version = \"[-0-9.a-zA-Z]*\"/var version = \"$VERSION\"/" $ANDROID_VERISON_PATH
 sed -i '' "s/static let version = \"[-0-9.a-zA-Z]*\"/static let version = \"$VERSION\"/" $IOS_VERISON_PATH
-sed -i '' '/<dependency id="cordova-airship" version="[^"]*"\/>/s/version="[^"]*"/version="'$VERSION'"/' $HMS_PLUGIN_XML_PATH
+sed -i '' '/<dependency id="@ua/cordova-airship" version="[^"]*"\/>/s/version="[^"]*"/version="'$VERSION'"/' $HMS_PLUGIN_XML_PATH
 npm --prefix $CORE_PACKAGE_PATH version $VERSION
 npm --prefix $HMS_PACKAGE_PATH version $VERSION