Merge pull request #42 from OutSystems/development

RMET-3341 ::: Prepare main for Release `1.2.0`

CHANGELOG.md

@@ -6,7 +6,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 The changes documented here do not include those from the original repository.
 
-## [Unreleased]
+## 1.2.0
+
+### Features
+- Update the iOS framework. This adds the Privacy Manifest file (https://outsystemsrd.atlassian.net/browse/RMET-3283).
+
+### Chores
+- Update cordova hooks with new OutSystems specific errors. (https://outsystemsrd.atlassian.net/browse/RMET-3311)
+
+## [Version 1.1.2]
+
+### 21-12-2023
+- Fix: [Android] Updates dependency to OSCore and OSCordova (https://outsystemsrd.atlassian.net/browse/RMET-2993).
+
+## [Version 1.1.1]
+
+### 03-10-2023
+- Fix: [iOS] Fixes path, removing duplicate string (https://outsystemsrd.atlassian.net/browse/RMET-2855).
+
+### 13-07-2023
+- Feat: Update hook to consider new resources paths (https://outsystemsrd.atlassian.net/browse/RMET-2477).
+
+- Chore: Update cordova hooks with new OutSystems specific errors. (https://outsystemsrd.atlassian.net/browse/RMET-3311)
 
 ## [Version 1.1.2]
 

hooks/android/androidCopyPreferences.js

@@ -41,13 +41,13 @@ module.exports = function (context) {
         jsonParsed = JSON.parse(jsonConfigFile);
     }
     catch {
-        throw new Error("Missing configuration file or error trying to obtain the configuration.");
+        throw new Error("OUTSYSTEMS_PLUGIN_ERROR: Missing configuration file or error trying to obtain the configuration.");
     }
 
-    jsonParsed.app_configurations.forEach(function(configItem) {
+    jsonParsed.app_configurations.forEach((configItem) => {
         if (configItem.service_id == ServiceEnum.GooglePay) {
             hasGooglePay = true;
-            var error_list = [];
+            let error_list = [];
 
             if(configItem.merchant_name && configItem.merchant_name !== ""){
                 merchant_name = configItem.merchant_name;
@@ -109,9 +109,9 @@ module.exports = function (context) {
             }
 
             if (error_list.length > 0) {
-                throw new Error("The following fields are either missing or empty in the configuration: " + error_list);
+                console.error("Missing fields: " + error_list);
+                throw new Error("OUTSYSTEMS_PLUGIN_ERROR: Payments configuration is missing some fields. Please check build logs to know more.");
             }
-            return;
         }
     });
 

hooks/ios/iOSCopyPreferences.js

@@ -2,7 +2,6 @@ const et = require('elementtree');
 const path = require('path');
 const fs = require('fs');
 const plist = require('plist');
-const child_process = require('child_process');
 const { ConfigParser } = require('cordova-common');
 
 module.exports = function (context) {
@@ -40,12 +39,12 @@ module.exports = function (context) {
         let jsonConfigFile = fs.readFileSync(jsonConfig, 'utf8');
         jsonParsed = JSON.parse(jsonConfigFile);
     } catch {
-        throw new Error("Missing configuration file or error trying to obtain the configuration.");
+        throw new Error("OUTSYSTEMS_PLUGIN_ERROR: Missing configuration file or error trying to obtain the configuration.");
     }
 
-    jsonParsed.app_configurations.forEach(function(configItem) {
+    jsonParsed.app_configurations.forEach((configItem) => {
         if (configItem.service_id == ServiceEnum.ApplePay) {
-            var error_list = [];
+            let error_list = [];
 
             if (configItem.merchant_id != null && configItem.merchant_id !== "") {
                 merchant_id = configItem.merchant_id;
@@ -102,10 +101,9 @@ module.exports = function (context) {
             }                   
 
             if (error_list.length > 0) {
-                throw new Error("Configuration is missing the following fields: " + error_list);
+                console.error("Missing fields: " + error_list);
+                throw new Error("OUTSYSTEMS_PLUGIN_ERROR: Payments configuration is missing some fields. Please check build logs to know more.");
             }
-
-            return;
         }
     });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.outsystems.payments",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "OutSystems-owned plugin for mobile payments",
   "keywords": [
     "ecosystem:cordova",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin id="com.outsystems.payments" version="1.1.2" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="com.outsystems.payments" version="1.2.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
   <name>OSPayments</name>
   <description>OutSystems-owned plugin for mobile payments</description>
   <author>OutSystems Inc</author>

src/ios/frameworks/OSPaymentsLib.xcframework/Info.plist

@@ -5,31 +5,35 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>OSPaymentsLib.framework/OSPaymentsLib</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>OSPaymentsLib.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>OSPaymentsLib.framework/OSPaymentsLib</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>OSPaymentsLib.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>