Check conflicts #126
Closed
Check conflicts #126
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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 <[email protected]> Co-authored-by: Ricardo Silva <[email protected]>
Signed-off-by: IT-MikeS <[email protected]>
# Conflicts: # CHANGELOG.md # src/android/build.gradle # src/android/com/outsystems/plugins/healthfitness/OSHealthFitness.kt # src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Info.plist # src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/OSHealthFitnessLib # src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Info.plist # src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/OSHealthFitnessLib # src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/_CodeSignature/CodeResources # www/OSHealthFitness.js
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Context
Type of changes
Platforms affected
Tests
Screenshots (if appropriate)
Checklist
RNMT-XXXX <title>