Installing the Radar Cordova SDK results in the app's Podfile being o…

…verwritten (#35) * update plugin pod spec & bump up version * update example * Update xcode version to 13.4.1 * npm install in plugin/ * Change .config location * Change .config location * Comment out chown --------- Co-authored-by: Tim Julien <[email protected]>
radarlabs · Oct 12, 2023 · 2998ca6 · 2998ca6
1 parent ba32967
commit 2998ca6
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,15 +14,15 @@ jobs:
       - run: cd example && cordova build
   ios:
     macos:
-      xcode: 13.1.0
+      xcode: 13.4.1
     working_directory: ~/cordova-plugin-radar
     steps:
       - checkout:
           path: ~/cordova-plugin-radar
-      - run: npm install
-      - run: sudo npm install -g cordova
+      - run: cd plugin && npm install
+      - run: cd plugin && sudo npm install -g cordova
       - run: cd example && npm install
-      - run: sudo chown -R 502:20 "/Users/distiller/.config"
+      # - run: sudo chown -R 502:20 "/Users/distiller/.config"
       - run: cd example && cordova platform add ios
       - run: cd example && cordova plugin add ../plugin
       - run: cd example && cordova build
@@ -31,4 +31,4 @@ workflows:
   android-ios:
     jobs:
       - android
-      - ios
+      - ios
diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/package.json b/example/package.json
@@ -9,7 +9,11 @@
   "cordova": {
     "plugins": {
       "@radarlabs/cordova-plugin-radar": {},
-      "cordova-plugin-radar": {}
+      "cordova-plugin-radar": {
+        "NS_LOCATION_WHEN_IN_USE_USAGE_DESCRIPTION": "This app uses your location for geofencing.",
+        "NS_LOCATION_ALWAYS_AND_WHEN_IN_USE_USAGE_DESCRIPTION": "This app uses your location for geofencing.",
+        "NS_LOCATION_ALWAYS_USAGE_DESCRIPTION": "This app uses your location for geofencing."
+      }
     },
     "platforms": [
       "ios",
@@ -19,6 +23,6 @@
   "devDependencies": {
     "@radarlabs/cordova-plugin-radar": "file:../plugin",
     "cordova-android": "^11.0.0",
-    "cordova-ios": "^6.2.0"
+    "cordova-ios": "^6.3.0"
   }
 }
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
diff --git a/plugin/package.json b/plugin/package.json
@@ -3,7 +3,7 @@
   "description": "Cordova plugin for Radar, the leading geofencing and location tracking platform",
   "homepage": "https://radar.com",
   "license": "Apache-2.0",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "main": "www/Radar.js",
   "devDependencies": {
     "babel-eslint": "^10.0.1",

diff --git a/plugin/plugin.xml b/plugin/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
         id="cordova-plugin-radar"
-        version="3.5.0">
+        version="3.5.1">
     <name>Radar</name>
     <js-module src="www/Radar.js" name="Radar">
         <clobbers target="cordova.plugins.radar"/>
@@ -54,6 +54,10 @@
 
         <header-file src="src/ios/CDVRadar.h"/>
         <source-file src="src/ios/CDVRadar.m"/>
-        <framework src="RadarSDK" type="podspec" spec="3.5.9"/>
+        <podspec>
+            <pods use-frameworks="true">
+                <pod name="RadarSDK" spec="3.5.9"/>
+            </pods>
+        </podspec>
     </platform>
 </plugin>
diff --git a/plugin/plugin.xml.template b/plugin/plugin.xml.template
@@ -54,6 +54,10 @@
 
         <header-file src="src/ios/CDVRadar.h"/>
         <source-file src="src/ios/CDVRadar.m"/>
-        <framework src="RadarSDK" type="podspec" spec="{{ version }}"/>
+        <podspec>
+            <pods use-frameworks="true">
+                <pod name="RadarSDK" spec="{{ version }}"/>
+            </pods>
+        </podspec>
     </platform>
 </plugin>