From d3857b22d4d8afb0545aacfbab04f623ba79f7d9 Mon Sep 17 00:00:00 2001 From: Ricardo Silva <97543217+OS-ricardomoreirasilva@users.noreply.github.com> Date: Tue, 9 Apr 2024 11:07:39 +0100 Subject: [PATCH] Solve conflicts (#125) * Prepare release of version 1.4.0 (#95) * chore: Add Unreleased Tag to CHANGELOG * feat: iOS Workouts (#88) Update Health and Fitness iOS library in order to include the new GetWorkoutsData feature. Add required code to bridge the feature between the callers (OutSystems) and iOS. * chore: Set Release Tag Set release tag on the repo's CHANGELOG file. * chore: Set Release Tag Set release tag on the repo's package.json and plugin.xml files. * chore: Update iOS Library (#90) Update "OSHealthFitnessLib.xcframework" to the latest version to include the fix for the notification trigger (https://outsystemsrd.atlassian.net/browse/RMET-2689). * chore: Update iOS Library (#91) Update "OSHealthFitnessLib.xcframework" to the latest version to enable notification editing (https://outsystemsrd.atlassian.net/browse/RMET-2688). * RMET-2723 Health & Fitness Plugin - Disconnect from google fit (#92) * feat: add disconnectFromGoogleFit method References: https://outsystemsrd.atlassian.net/browse/RMET-2723 * chore: update library dependency References: https://outsystemsrd.atlassian.net/browse/RMET-2723 * chore: update changelog References: https://outsystemsrd.atlassian.net/browse/RMET-2723 * chore: update library version References: https://outsystemsrd.atlassian.net/browse/RMET-2723 * chore: update library version References: https://outsystemsrd.atlassian.net/browse/RMET-2723 * chore: Update iOS xcframework (#94) Update to the 1.3.1 tag version. * chore(release): raise to version 1.4.0 References: https://outsystemsrd.atlassian.net/browse/RMET-2723 --------- Co-authored-by: OS-ricardomoreirasilva Co-authored-by: Ricardo Silva <97543217+OS-ricardomoreirasilva@users.noreply.github.com> * chore: add CODEOWNERS (#110) Signed-off-by: IT-MikeS <20338451+IT-MikeS@users.noreply.github.com> --------- Signed-off-by: IT-MikeS <20338451+IT-MikeS@users.noreply.github.com> Co-authored-by: Alexandre Jacinto Co-authored-by: Mike Summerfeldt <20338451+IT-MikeS@users.noreply.github.com>