@situm/cordova 3.3.4 → 3.3.6

package/azure/common-steps.yaml

@@ -1,5 +1,5 @@
 steps:
   - checkout: self
     fetchTags: false
-    fetchDepth: 1
+    fetchDepth: 3
     displayName: Checkout repo

package/azure-pipelines.yml

@@ -240,30 +240,6 @@ jobs:
             bitbucket_pass: $(bitbucket_pass)
           release: "cordova"
       
-      - checkout: cordova_sdk_validation 
-        fetchTags: false
-        fetchDepth: 1
-        displayName: Checkout Cordova app example
-      
-      - bash: |
-          cd cordova-sdk-validation
-          echo -e "\n[+] Setting git remote credentials\n"
-          git remote set-url origin https://$(bitbucket_user):$(bitbucket_pass)@bitbucket.org/situm/cordova-sdk-validation.git
-          
-          cat .git/config
-      
-          echo -e "\n[+] Fetch branches"
-          git fetch origin master
-          echo -e "\n[+] Checkout to master branch\n"
-          git checkout master
-      
-          echo -e "\n[+] Commit empty change to run examples repo\n"
-          git commit -m "Publish Cordova SDK plugin release $(version)" --allow-empty
-          echo -e "\n[+] Push empty change \n"
-          git push origin master
-          
-        displayName: Execute example app 
-            
       - bash: |
           if [ -d "cordova" ]; then
             cd cordova

package/example/android/app/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.application'
 
 android {
-    namespace "com.situm.capacitor_example"
+    namespace "com.situm.capacitorexample"
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "com.situm.capacitor_example"
+        applicationId "com.situm.capacitorexample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1

package/example/android/app/src/main/java/com/situm/{capacitor_example → capacitorexample}/MainActivity.java

@@ -1,4 +1,4 @@
-package com.situm.capacitor_example;
+package com.situm.capacitorexample;
 
 import com.getcapacitor.BridgeActivity;
 

package/example/android/app/src/main/res/values/strings.xml

@@ -2,6 +2,6 @@
 <resources>
     <string name="app_name">Situm Capacitor Example</string>
     <string name="title_activity_main">Situm Capacitor Example</string>
-    <string name="package_name">com.situm.capacitor_example</string>
-    <string name="custom_url_scheme">com.situm.capacitor_example</string>
+    <string name="package_name">com.situm.capacitorexample</string>
+    <string name="custom_url_scheme">com.situm.capacitorexample</string>
 </resources>

package/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/example/angular.json

@@ -126,7 +126,10 @@
     }
   },
   "cli": {
-    "schematicCollections": ["@ionic/angular-toolkit"]
+    "schematicCollections": [
+      "@ionic/angular-toolkit"
+    ],
+    "analytics": false
   },
   "schematics": {
     "@ionic/angular-toolkit:component": {

package/example/azure/build-examples.yaml

@@ -0,0 +1,138 @@
+parameters:
+  - name: system
+    type: string
+  - name: XAPIEMAIL
+    type: string
+  - name: BUILDINGID
+    type: string
+  - name: BUILDNUMBER
+    type: string
+    default: "202430015"
+  - name: MAPVIEWERDOMAIN
+    type: string
+
+steps:
+    - ${{ if contains(parameters.system, 'macOS') }}:
+      - task: DownloadSecureFile@1
+        name: api_key
+        inputs:
+          secureFile: api_key.json
+
+      - task: InstallAppleCertificate@2
+        inputs:
+          certSecureFile: AppleCert23.p12
+
+      - task: InstallAppleCertificate@2
+        inputs:
+          certSecureFile: DistributorWildcard.p12
+
+      - task: InstallAppleProvisioningProfile@1
+        inputs:
+          provisioningProfileLocation: 'secureFiles'
+          provProfileSecureFile: Situm_Cordova_SDK_Example.mobileprovision
+          removeProfile: true
+
+      - task: InstallAppleProvisioningProfile@1
+        inputs:
+          provisioningProfileLocation: 'secureFiles'
+          provProfileSecureFile: DistributorOnline.mobileprovision
+          removeProfile: true
+
+      - bash: |
+          echo -e "\n[+] Install iOS example dependencies\n"
+          cd example
+
+          echo -e "\n[+] Build ios app\n"
+          npx ionic cap sync ios
+
+          cd ios/App
+
+          echo -e "\n[+] Pod install with --repo-update option \n"
+          pod install --repo-update
+
+        displayName: Install iOS example dependencies
+
+      - bash: |
+
+          echo -e "\n[+] Selecting the Xcode version $(xcodeVersion)\n"
+
+          sudo xcode-select -switch $(xcodeVersion)
+
+          cd example/ios/App/fastlane
+
+          echo -e "\n[+] Setting Apple connection options"
+
+          cp $(api_key.secureFilePath) .
+
+          echo -e "\n[+] Install fastlane \n"
+          gem install fastlane
+
+          export WHATS_NEW="Plugin version: $(pluginVersion), USER: ${{parameters.XAPIEMAIL}}, BUILDINGID: ${{ parameters.BUILDINGID }}, DASHBOARD_URL: https://dashboard.situm.com MAPVIEWER_DOMAIN: ${{ parameters.MAPVIEWERDOMAIN}}"
+          export BUILDNUMBER=${{ parameters.BUILDNUMBER }}
+          export appleDevTeamId=$(appleDevTeamId)
+          echo -e "\n[+] Setting variables to deploy:"
+          echo -e "\t[+] Set WHATS_NEW: $WHATS_NEW"
+
+
+          echo -e "\n[+] Build example with fastlane \n"
+          fastlane ios beta
+
+        displayName: Build iOS example
+
+    - ${{ if contains(parameters.system, 'ubuntu') }}:
+      - task: JavaToolInstaller@0
+        inputs:
+          versionSpec: '17'
+          jdkArchitectureOption: 'x64'
+          jdkSourceOption: 'PreInstalled'
+        displayName: Install Java 17 for Gradle
+
+      - bash: |
+          cd example
+
+          echo -e "\n[+] Build android app \n"
+          npx ionic capacitor sync android
+
+          cd android
+          ./gradlew assembleDebug
+
+        displayName: Build Android dependencies
+
+
+      - bash: |
+          if [[ "$(Build.Reason)" == "Manual" ]];then
+            folder="$(CordovaExample_folder)/Manual"
+          else
+            folder="$(CordovaExample_folder)"
+          fi
+          branchName=$(echo $(Build.SourceBranch)| cut -d "/" -f 3,4 | sed 's/\//_/g')
+          branchFolder="$branchName"
+          destinationFolder="$(pluginVersion)"
+
+          echo -e "\n[+] Variables to Sharepoint Upload:"
+          echo -e "\t[+] Folder: $folder"
+          echo -e "\t[+] Branch Name: $branchName"
+          echo -e "\t[+] Branch folder: $folder/$branchFolder"
+          echo -e "\t[+] Destination folder: $folder/$branchFolder/$destinationFolder"
+          echo -e "\t[+] Plugin Version: $(pluginVersion)"
+
+
+          echo -e "\n[+] Install $(office365Cli) cli\n"
+
+          npm i -g $(office365Cli)
+
+          echo -e "\n[+] Login in Sharepoint \n"
+          m365 login --authType password --userName $(sharepoint_user)  --password $(sharepoint_pass)
+
+          echo -e "\n[+] Create Branch folder $folder/$branchFolder\n"
+          m365 spo folder add -p $folder -u $(SharepointUrl) --name $branchFolder
+
+          echo -e "\n[+] Create Destination folder $folder/$branchFolder/$destinationFolder\n"
+          m365 spo folder add -p $folder/$branchFolder -u $(SharepointUrl) --name $destinationFolder
+
+          echo -e "\n[+] Upload APK to $folder/$branchFolder/$destinationFolder\n"
+          cd example/android/app/build/outputs/apk/debug
+          mv app-debug.apk ${{ parameters.BUILDNUMBER }}-debug.apk
+          m365 spo file add -p ${{ parameters.BUILDNUMBER }}-debug.apk -u $(SharepointUrl) -f $folder/$branchFolder/$destinationFolder
+
+        displayName: Upload APK

package/example/azure/common-steps.yaml

@@ -0,0 +1,66 @@
+parameters:
+  - name: system
+    type: string
+  - name: XAPIEMAIL
+    type: string
+  - name: XAPIKEY
+    type: string
+  - name: BUILDINGID
+    type: string
+  - name: MAPVIEWERDOMAIN
+    type: string
+  - name: REMOTEIDENTIFIER
+    type: string
+  - name: BUILDNUMBER
+    type: string
+    default: "Value only set in iOS"
+steps:
+  - checkout: self
+    fetchDepth: 1
+    fetchTags: false
+    displayName: Clone repository
+
+  - task: NodeTool@0
+    inputs:
+      versionSource: "spec" # 'spec' | 'fromFile'. Required. Source of version. Default: spec.
+      versionSpec: $(nodeVersion)
+
+  - bash: |
+
+      echo -e "\n[+] Installing NPM version $(npmVersion)\n"
+      npm install -g $(npmVersion)
+
+      echo -e "\n[+] Install $(ioniccli)\n"
+      npm install $(ioniccli)
+
+      echo -e "\n[+] Install plugin dependencies\n"
+      npm install
+
+      echo -e "\n[+] Install example dependencies\n"
+      cd example
+      rm -rf ios/Podfile.lock
+      npm install
+
+
+    displayName: Install plugin dependencies
+
+  - bash: |
+
+      export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
+      pluginVersion=$(grep -E '"version": "[0-9]+\.[0-9]+\.[0-9]+"' package.json | awk -F"\"" '{print $4}')
+      echo "##vso[task.setvariable variable=pluginVersion]$(echo $pluginVersion)"
+
+      echo -e "\n[+] Variables to set:"
+      echo -e "\t[+] X-API-EMAIL: ${{ parameters.XAPIEMAIL }}"
+      echo -e "\t[+] BUILDINGID: ${{ parameters.BUILDINGID }}"
+      echo -e "\t[+] MAPVIEWERDOMAIN: ${{ parameters.MAPVIEWERDOMAIN }}"
+      echo -e "\t[+] BUILDNUMBER: ${{ parameters.BUILDNUMBER }}"
+      echo -e "\t[+] Plugin Version used: $pluginVersion"
+
+      echo "export const API_USER = '${{ parameters.XAPIEMAIL }}';" > example/src/constants.ts
+      echo "export const API_KEY = '${{ parameters.XAPIKEY }}';" >> example/src/constants.ts
+      echo "export const BUILDING_IDENTIFIER = '${{ parameters.BUILDINGID }}';" >> example/src/constants.ts
+      echo "export const VIEWER_DOMAIN = '${{ parameters.MAPVIEWERDOMAIN }}';" >> example/src/constants.ts
+      echo "export const REMOTE_IDENTIFIER = '${{ parameters.REMOTEIDENTIFIER }}';" >> example/src/constants.ts
+
+    displayName: Configure credentials

package/example/azure-pipelines.yml

@@ -0,0 +1,147 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+  - master
+
+pr: none
+
+parameters:
+  - name: XAPIEMAIL
+    type: string
+    displayName: X-API-EMAIL
+    default: user@email.com
+  - name: XAPIKEY
+    type: string
+    displayName: X-API-KEY
+    default: user-api-key
+  - name: BUILDINGID
+    type: string
+    default: "1"
+  - name: MAPVIEWERDOMAIN
+    type: string
+    default: "https://map-viewer.situm.com"
+  - name: REMOTEIDENTIFIER
+    type: string
+    default: "demo"
+
+variables:
+  - group: Passwords
+  - group: SoftwareVersions
+  - group: SharepointPaths
+
+resources:
+  repositories:
+  - repository: sys_kubernetes_templates
+    type: bitbucket
+    endpoint: Bitbucket - sistemas
+    name: situm/sys-kubernetes-templates.git
+
+jobs:
+  #===============================================================
+  # Job for Android app
+  #===============================================================
+  - job:
+    displayName: Build Android App
+    pool:
+      vmImage: $(ubuntuVersion)
+    steps:
+    - ${{ if ne(variables['Build.Reason'],'manual') }}:
+      - bash: |
+           echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))"
+           echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))"
+           echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))"
+           echo "##vso[task.setvariable variable=MAPVIEWERDOMAIN]$(echo $(DEFAULT_MAPVIEWURL))"
+           echo "##vso[task.setvariable variable=REMOTEIDENTIFIER]$(echo $(DEFAULT_REMOTEIDENTIFIER))"
+           echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')"
+
+           echo -e "\n[!] I'm a shy step so I don't show any information. You'll see my work in the Configure Credentials step"
+        displayName: Configure Automatic run Vars
+
+    - ${{ if eq(variables['Build.Reason'],'manual') }}:
+      - bash: |
+           echo "##vso[task.setvariable variable=XAPIKEY]$(echo ${{parameters.XAPIKEY}})"
+           echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo ${{ parameters.XAPIEMAIL}})"
+           echo "##vso[task.setvariable variable=BUILDINGID]$(echo ${{ parameters.BUILDINGID}})"
+           echo "##vso[task.setvariable variable=MAPVIEWERDOMAIN]$(echo ${{ parameters.MAPVIEWERDOMAIN }})"
+           echo "##vso[task.setvariable variable=REMOTEIDENTIFIER]$(echo ${{ parameters.REMOTEIDENTIFIER }})"
+           echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')"
+
+           echo -e "\n[!] I'm a shy step so I don't show any information. You'll see my work in the Configure Credentials step"
+        displayName: Configure Manual run Vars
+
+    - template: azure/common-steps.yaml
+      parameters:
+        XAPIKEY: $(XAPIKEY)
+        XAPIEMAIL: $(XAPIEMAIL)
+        BUILDINGID: $(BUILDINGID)
+        MAPVIEWERDOMAIN: $(MAPVIEWERDOMAIN)
+        REMOTEIDENTIFIER: $(REMOTEIDENTIFIER)
+        system: $(ubuntuVersion)
+        BUILDNUMBER: $(BUILDNUMBER)
+
+    - template: azure/build-examples.yaml
+      parameters:
+        system: $(ubuntuVersion)
+        BUILDINGID: $(BUILDINGID)
+        XAPIEMAIL: $(XAPIEMAIL)
+        MAPVIEWERDOMAIN: $(MAPVIEWERDOMAIN)
+        BUILDNUMBER: $(BUILDNUMBER)
+
+  #===============================================================
+  # Job for iOS app
+  #===============================================================
+  - job:
+    displayName: Build iOS App
+    pool:
+      vmImage: $(macOSVersion)
+    steps:
+    - ${{ if ne(variables['Build.Reason'],'manual') }}:
+      - bash: |
+           echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))"
+           echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))"
+           echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))"
+           echo "##vso[task.setvariable variable=MAPVIEWERDOMAIN]$(DEFAULT_MAPVIEWURL)"
+           echo "##vso[task.setvariable variable=REMOTEIDENTIFIER]$(echo $(DEFAULT_REMOTEIDENTIFIER))"
+           echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')"
+
+           echo -e "\n[!] I'm a shy step so I don't show any information. You'll see my work in the Configure Credentials step"
+        displayName: Configure Automatic run Vars
+
+    - ${{ if eq(variables['Build.Reason'],'manual') }}:
+      - bash: |
+           echo "##vso[task.setvariable variable=XAPIKEY]$(echo ${{parameters.XAPIKEY}})"
+           echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo ${{ parameters.XAPIEMAIL}})"
+           echo "##vso[task.setvariable variable=BUILDINGID]$(echo ${{ parameters.BUILDINGID}})"
+           echo "##vso[task.setvariable variable=MAPVIEWERDOMAIN]$(echo ${{ parameters.MAPVIEWERDOMAIN }})"
+           echo "##vso[task.setvariable variable=REMOTEIDENTIFIER]$(echo ${{ parameters.REMOTEIDENTIFIER }})"
+           echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')"
+
+           echo -e "\n[!] I'm a shy step so I don't show any information. You'll see my work in the Configure Credentials step"
+        displayName: Configure Manual run Vars
+
+    - bash: |
+         echo -e "\n[+] Install gnu-sed\n"
+         brew install gnu-sed
+      displayName: Install gnu-sed
+
+    - template: azure/common-steps.yaml
+      parameters:
+        XAPIKEY: $(XAPIKEY)
+        XAPIEMAIL: $(XAPIEMAIL)
+        BUILDINGID: $(BUILDINGID)
+        system: $(macOSVersion)
+        BUILDNUMBER: $(BUILDNUMBER)
+        MAPVIEWERDOMAIN: $(MAPVIEWERDOMAIN)
+        REMOTEIDENTIFIER: $(REMOTEIDENTIFIER)
+
+    - template: azure/build-examples.yaml
+      parameters:
+        MAPVIEWERDOMAIN: $(MAPVIEWERDOMAIN)
+        system: $(macOSVersion)
+        XAPIEMAIL: $(XAPIEMAIL)
+        BUILDINGID: $(BUILDINGID)
+        BUILDNUMBER: $(BUILDNUMBER)
+

package/example/capacitor.config.ts

@@ -1,7 +1,7 @@
 import { CapacitorConfig } from '@capacitor/cli';
 
 const config: CapacitorConfig = {
-  appId: 'com.situm.capacitor_example',
+  appId: 'com.situm.capacitorexample',
   appName: 'Situm Capacitor Example',
   webDir: 'www',
   server: {

package/example/ios/App/App/Info.plist

@@ -28,6 +28,20 @@
 	<string>Location is required to find out where you are</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Location is required to find out where you are</string>
+  <key>NSCalendarsUsageDescription</key>
+  <string>This app requires calendar access to function properly.</string>
+  <key>NSContactsUsageDescription</key>
+  <string>This app requires contacts access to function properly.</string>
+  <key>NSPhotoLibraryUsageDescription</key>
+  <string>This app requires photo library access to function properly.</string>
+  <key>NSMicrophoneUsageDescription</key>
+  <string>This app requires Microphone access to function properly.</string>
+  <key>NSMotionUsageDescription</key>
+  <string>This app requires Motion access to function properly.</string>
+  <key>NSBluetoothAlwaysUsageDescription</key>
+  <string>This app requires Bluetooth access to function properly.</string>
+  <key>ITSAppUsesNonExemptEncryption</key>
+  <false />
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

package/example/ios/App/fastlane/Fastfile

@@ -0,0 +1,69 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:ios)
+
+platform :ios do
+  desc "Build example"
+  lane :beta do
+    #=================================================
+    #Get Latest version and build number
+    #=================================================
+    latest_testflight_build_number(
+      api_key_path:"./fastlane/api_key.json",
+      app_identifier:"com.situm.capacitorexample",
+    )
+
+    #====================================================
+    #Increment version number and build number
+    #
+    #====================================================
+    #
+    version_number = lane_context[SharedValues::LATEST_TESTFLIGHT_VERSION]
+    increment_version_number(
+      version_number: version_number
+      )
+    increment_build_number(
+      build_number: ENV['BUILDNUMBER']
+    )
+
+
+    #=================================================
+    # Build iOS Example RNSDK
+    # ================================================
+    build_app(
+      workspace: "App.xcworkspace",
+      configuration: "Release",
+      scheme: "App",
+      export_method: "app-store",
+      xcargs: "CODE_SIGN_STYLE=Manual PROVISIONING_PROFILE_SPECIFIER=\"Situm Cordova SDK Example\" DEVELOPMENT_TEAM=\""+ENV['appleDevTeamId']+"\" PRODUCT_BUNDLE_IDENTIFIER=\"com.situm.capacitorexample\"",
+      export_options: {
+          provisioningProfiles: {
+              "com.situm.capacitorexample" => "DistributorOnline"
+            },
+        }
+    )
+
+    #=================================================
+    # Upload to Testflight
+    # ================================================
+    upload_to_testflight(
+      api_key_path:"./fastlane/api_key.json",
+      skip_submission: true,
+      skip_waiting_for_build_processing: true,
+      changelog: ENV['WHATS_NEW']
+      )
+  end
+end