@situm/cordova 3.15.60 → 3.15.62

package/README.md

@@ -620,8 +620,7 @@ cordova.plugins.MapView.onLoad((controller: any) => {
     1.  Install mocha and expect.js:
 
     ```javascript
-    npm install mocha --save
-    npm install expect.js --save
+    pnpm add -D mocha expect.js
     ```
 
     2. In js tests folder run:

package/azure-pipelines.yml

@@ -123,13 +123,15 @@ jobs:
 
         steps:
           - bash: |
-              cd cordova
+              echo -e "\n[+] Installing PNPM version $(pnpmVersion)\n"
+              corepack enable
+              corepack prepare pnpm@$(pnpmVersion) --activate
 
-              echo -e "\n[+] Install npm dependencies \n"
-              npm install
+              echo -e "\n[+] Install dependencies \n"
+              pnpm install
 
-              echo -e "\n[+] Execute npm tests \n"
-              npm test
+              echo -e "\n[+] Execute tests \n"
+              pnpm test
             displayName: JS Test
 
   - ${{ if contains(variables['Build.SourceBranch'], 'release/') }}:
@@ -165,15 +167,12 @@ jobs:
 
           - bash: |
 
-              echo -e "\n[+] Installing NPM version $(npmVersion)\n"
-              npm install -g $(npmVersion)
-
               currentBranch=$(echo $(Build.SourceBranch) | cut -d "/" -f 3,4)
               echo "##vso[task.setvariable variable=currentBranch]$(echo $currentBranch)"
 
               echo -e "\n[+] Variables:"
               echo -e "\t[+] Plugin version: $(version)"
-              echo -e "\t[+] NPM CLI version: $(npm --version)"
+              echo -e "\t[+] PNPM CLI version: $(pnpm --version)"
               echo -e "\t[+] Current branch: $currentBranch"
 
               echo -e "\n[+] Setting git remote credentials\n"
@@ -188,8 +187,13 @@ jobs:
           - bash: |
 
               cd cordova
+
+              echo -e "\n[+] Installing PNPM version $(pnpmVersion)\n"
+              corepack enable
+              corepack prepare pnpm@$(pnpmVersion) --activate
+
               echo -e "\n[+] Setting NPM version to $(version)"
-              npm version $(version) --no-git-tag-version
+              pnpm version $(version) --no-git-tag-version
 
               echo -e "\n[+] Change plugin version in plugin.xml"
               sed -i "s/version=\".*\">/version=\"$(version)\">/g" plugin.xml
@@ -234,7 +238,7 @@ jobs:
               echo "//registry.npmjs.org/:_authToken=$(NPM_TOKEN)" > ~/.npmrc
 
               echo -e "\n[+] Publish NPM packages"
-              npm publish --access=public
+              pnpm publish --access public
 
             displayName: NPM publish
 
@@ -242,10 +246,10 @@ jobs:
               cd cordova
 
               echo -e "\n[+] Install dependencies"
-              npm install
+              pnpm install
 
               echo -e "\n[+] Generate Documentation\n"
-              npm run jsdoc
+              pnpm run jsdoc
 
             displayName: Generate JSDoc
 

package/example/README.md

@@ -39,7 +39,7 @@ git clone https://github.com/situmtech/cordova.git
 
 ```bash
 cd cordova/example
-npm install
+pnpm install
 ```
 
 > [!TIP]
@@ -78,9 +78,16 @@ From the `example/` folder, execute the following command to run the app on your
 
 ```bash
 # For Android devices
-ionic cap run android
+pnpm run cap:android
 # For iOS devices
-ionic cap run ios
+pnpm run cap:ios
+```
+
+You can also run the same commands from the repository root:
+
+```bash
+pnpm --dir example run cap:android
+pnpm --dir example run cap:ios
 ```
 
 > [!NOTE]

package/example/azure/build-examples.yaml

@@ -119,7 +119,10 @@ steps:
 
           echo -e "\n[+] Install $(office365Cli) cli\n"
 
-          npm i -g $(office365Cli)
+          export PNPM_HOME="$HOME/.local/share/pnpm"
+          export PATH="$PNPM_HOME:$PNPM_HOME/bin:$PATH"
+
+          pnpm i -g $(office365Cli)
 
           echo -e "\n[+] Login in Sharepoint \n"
           m365 login --authType password --userName $(sharepoint_user)  --password $(sharepoint_pass) --appId $(sharepoint_appId)

package/example/azure/common-steps.yaml

@@ -27,19 +27,22 @@ steps:
 
   - bash: |
 
-      echo -e "\n[+] Installing NPM version $(npmVersion)\n"
-      npm install -g $(npmVersion)
+      echo -e "\n[+] Installing PNPM version $(pnpmVersion)\n"
+      corepack enable
+      corepack prepare pnpm@$(pnpmVersion) --activate
+
+      pnpm setup
 
       echo -e "\n[+] Install $(ioniccli)\n"
-      npm install $(ioniccli)
+      pnpm install $(ioniccli)
 
       echo -e "\n[+] Install plugin dependencies\n"
-      npm install
+      pnpm install
 
       echo -e "\n[+] Install example dependencies\n"
       cd example
       rm -rf ios/Podfile.lock
-      npm install
+      pnpm install
 
 
     displayName: Install plugin dependencies

package/example/ios/App/App.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1FD0412F0D3EDDF7AACCD45E /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03FA4A350CB380B663C7A526 /* Pods_App.framework */; };
 		2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; };
 		50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; };
 		504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; };
@@ -14,10 +15,10 @@
 		504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
 		504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
 		50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
-		A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		03FA4A350CB380B663C7A526 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = "<group>"; };
 		50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
 		504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -27,9 +28,8 @@
 		504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
-		AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
-		FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
+		88A95C137B6C4B2AEC4875C5 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
+		E29925A1E89647FC8837173D /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -37,28 +37,20 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */,
+				1FD0412F0D3EDDF7AACCD45E /* Pods_App.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		504EC2FB1FED79650016851F = {
 			isa = PBXGroup;
 			children = (
 				504EC3061FED79650016851F /* App */,
 				504EC3051FED79650016851F /* Products */,
-				7F8756D8B27F46E3366F6CEA /* Pods */,
-				27E2DDA53C4D2A4D1A88CE4A /* Frameworks */,
+				DF62C5A1641624CEA467D8A3 /* Pods */,
+				BC6DF3CB8D5D6EE5A6A75B80 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -85,13 +77,22 @@
 			path = App;
 			sourceTree = "<group>";
 		};
-		7F8756D8B27F46E3366F6CEA /* Pods */ = {
+		BC6DF3CB8D5D6EE5A6A75B80 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				03FA4A350CB380B663C7A526 /* Pods_App.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		DF62C5A1641624CEA467D8A3 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */,
-				AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
+				E29925A1E89647FC8837173D /* Pods-App.debug.xcconfig */,
+				88A95C137B6C4B2AEC4875C5 /* Pods-App.release.xcconfig */,
 			);
 			name = Pods;
+			path = Pods;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -101,11 +102,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
 			buildPhases = (
-				6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
+				BD864F47D59D0446D2B8119D /* [CP] Check Pods Manifest.lock */,
 				504EC3001FED79650016851F /* Sources */,
 				504EC3011FED79650016851F /* Frameworks */,
 				504EC3021FED79650016851F /* Resources */,
-				322C292109725211478F9F91 /* [CP] Copy Pods Resources */,
+				01D7EEE3D9470B0CB26A647F /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -167,7 +168,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		322C292109725211478F9F91 /* [CP] Copy Pods Resources */ = {
+		01D7EEE3D9470B0CB26A647F /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -182,16 +183,20 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
+		BD864F47D59D0446D2B8119D /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
 				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
 				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
 			);
@@ -342,7 +347,7 @@
 		};
 		504EC3171FED79650016851F /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
+			baseConfigurationReference = E29925A1E89647FC8837173D /* Pods-App.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
@@ -363,7 +368,7 @@
 		};
 		504EC3181FED79650016851F /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
+			baseConfigurationReference = 88A95C137B6C4B2AEC4875C5 /* Pods-App.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;

package/example/ios/App/Podfile

@@ -1,4 +1,4 @@
-require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
+require_relative '../../../node_modules/.pnpm/@capacitor+ios@5.5.1_@capacitor+core@5.7.8/node_modules/@capacitor/ios/scripts/pods_helpers'
 
 platform :ios, '13.0'
 use_frameworks! :linkage => :static
@@ -9,16 +9,16 @@ use_frameworks! :linkage => :static
 install! 'cocoapods', :disable_input_output_paths => true
 
 def capacitor_pods
-  pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
-  pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
-  pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
-  pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera'
-  pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
-  pod 'CapacitorGeolocation', :path => '../../node_modules/@capacitor/geolocation'
-  pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
-  pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
-  pod 'CapacitorPreferences', :path => '../../node_modules/@capacitor/preferences'
-  pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
+  pod 'Capacitor', :path => '../../../node_modules/.pnpm/@capacitor+ios@5.5.1_@capacitor+core@5.7.8/node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../../node_modules/.pnpm/@capacitor+ios@5.5.1_@capacitor+core@5.7.8/node_modules/@capacitor/ios'
+  pod 'CapacitorApp', :path => '../../../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/app'
+  pod 'CapacitorCamera', :path => '../../../node_modules/.pnpm/@capacitor+camera@5.0.10_@capacitor+core@5.7.8/node_modules/@capacitor/camera'
+  pod 'CapacitorFilesystem', :path => '../../../node_modules/.pnpm/@capacitor+filesystem@5.2.2_@capacitor+core@5.7.8/node_modules/@capacitor/filesystem'
+  pod 'CapacitorGeolocation', :path => '../../../node_modules/.pnpm/@capacitor+geolocation@5.0.8_@capacitor+core@5.7.8/node_modules/@capacitor/geolocation'
+  pod 'CapacitorHaptics', :path => '../../../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/haptics'
+  pod 'CapacitorKeyboard', :path => '../../../node_modules/.pnpm/@capacitor+keyboard@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/keyboard'
+  pod 'CapacitorPreferences', :path => '../../../node_modules/.pnpm/@capacitor+preferences@5.0.8_@capacitor+core@5.7.8/node_modules/@capacitor/preferences'
+  pod 'CapacitorStatusBar', :path => '../../../node_modules/.pnpm/@capacitor+status-bar@5.0.6_@capacitor+core@5.7.8/node_modules/@capacitor/status-bar'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
 end
 

package/example/package.json

@@ -7,6 +7,9 @@
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
+    "cap:android": "ionic cap run android",
+    "cap:ios": "ionic cap run ios",
+    "cap:sync": "ionic cap sync",
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
     "lint": "ng lint"
@@ -34,8 +37,7 @@
     "@capacitor/status-bar": "5.0.6",
     "@ionic/angular": "^7.5.0",
     "@ionic/cli": "^7.1.5",
-    "@situm/cordova": "file:..",
-    "cordova.plugins.diagnostic": "^7.1.4",
+    "@situm/cordova": "workspace:*",
     "ionicons": "^7.2.1",
     "rxjs": "^7.8.1",
     "tslib": "^2.3.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@situm/cordova",
-  "version": "3.15.60",
+  "version": "3.15.62",
   "description": "Situm Wayfinding for Capacitor and Cordova. Integrate plug&play indoor navigation experience with floorplans, POIs, routes and turn-by-turn directions in no time. With the power of Situm.",
   "private": false,
   "repository": "https://github.com/situmtech/cordova",
@@ -39,11 +39,6 @@
     "q": "^1.5.1",
     "tui-jsdoc-template": "^1.2.2"
   },
-  "scripts": {
-    "test": "cd tests/js && mocha",
-    "eslint": "node node_modules/eslint/bin/eslint www && node node_modules/eslint/bin/eslint src && node node_modules/eslint/bin/eslint tests",
-    "jsdoc": "rm -rf docs/JSDoc && ./node_modules/.bin/jsdoc www/situm.js www/Interfaces.js www/map-view.js www/map-view-controller.js -c ./docs/conf.json -d docs/JSDoc"
-  },
   "devDependencies": {
     "eslint": "^5.3.0",
     "eslint-config-semistandard": "^11.0.0",
@@ -52,9 +47,14 @@
     "eslint-plugin-node": "^5.0.0",
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^3.0.1",
-    "jsdoc": "^3.5.5",
-    "mocha": "^5.2.0",
     "expect.js": "^0.3.1",
-    "jsdoc-toolkit": "0.0.2"
+    "jsdoc": "^3.5.5",
+    "jsdoc-toolkit": "0.0.2",
+    "mocha": "^5.2.0"
+  },
+  "scripts": {
+    "test": "cd tests/js && mocha",
+    "eslint": "node node_modules/eslint/bin/eslint www && node node_modules/eslint/bin/eslint src && node node_modules/eslint/bin/eslint tests",
+    "jsdoc": "rm -rf docs/JSDoc && ./node_modules/.bin/jsdoc www/situm.js www/Interfaces.js www/map-view.js www/map-view-controller.js -c ./docs/conf.json -d docs/JSDoc"
   }
-}
+}

package/plugin.xml

@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="@situm/cordova"
-    version="3.15.60">
+    version="3.15.62">
     <name>Situm Cordova plugin Official</name>
     <description>This is the stable branch.</description>
     <license>MIT</license>
@@ -94,7 +94,7 @@
             <config>
             </config>
             <pods use-frameworks="false">
-                <pod name="SitumSDK" spec="~> 3.39.4"/>
+                <pod name="SitumSDK" spec="~> 3.40.0"/>
             </pods>
         </podspec>
 

package/pnpm-workspace.yaml

@@ -0,0 +1,6 @@
+allowBuilds:
+  esbuild: true
+  nice-napi: true
+minimumReleaseAge: 4320
+packages:
+  - "example"

package/src/android/app/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     implementation ('com.googlecode.json-simple:json-simple:1.1.1'){
         exclude group: 'junit', module:'junit'
     }
-    implementation ('es.situm:situm-sdk:3.36.7@aar') {
+    implementation ('es.situm:situm-sdk:3.37.0@aar') {
         transitive = true
     }
     implementation 'org.apache.cordova:framework:10.1.1'

package/src/android/situm.gradle

@@ -12,7 +12,7 @@ allprojects {
 
 dependencies {
     implementation 'com.google.android.gms:play-services-location:16.0.0'
-    implementation('es.situm:situm-sdk:3.36.7@aar') {
+    implementation('es.situm:situm-sdk:3.37.0@aar') {
         transitive = true
     }
 }