Skip to content

Commit

Permalink
Prepare release of version 1.4.0 (#95)
Browse files Browse the repository at this point in the history
* 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 <ricardo.moreira.silva@outsystems.com>
Co-authored-by: Ricardo Silva <97543217+OS-ricardomoreirasilva@users.noreply.github.com>
  • Loading branch information
3 people committed Aug 28, 2023
1 parent fc50c4e commit 1f8dde7
Show file tree
Hide file tree
Showing 30 changed files with 55,215 additions and 69 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ 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.

## [Version 1.4.0]

## 2023-08-25
- Implemented feature to disable Google Fit (https://outsystemsrd.atlassian.net/browse/RMET-2723).

## [Version 1.3.0]
- Feat: [iOS] Add a method to retrieve workouts raw data from HealthKit (https://outsystemsrd.atlassian.net/browse/RMET-2128).

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.outsystems.plugins.healthfitness",
"version": "1.3.0",
"version": "1.4.0",
"description": "Health & Fitness cordova plugin for OutSystems applications.",
"keywords": [
"ecosystem:cordova",
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<plugin id="com.outsystems.plugins.healthfitness" version="1.3.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<plugin id="com.outsystems.plugins.healthfitness" version="1.4.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<name>HealthFitness</name>
<description>Health &amp; Fitness cordova plugin for OutSystems applications.</description>
<author>OutSystems Inc</author>
Expand Down
2 changes: 1 addition & 1 deletion src/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies{

implementation("com.github.outsystems:oscore-android:1.2.0@aar")
implementation("com.github.outsystems:oscordova-android:1.2.0@aar")
implementation("com.github.outsystems:oshealthfitness-android:1.1.1@aar")
implementation("com.github.outsystems:oshealthfitness-android:1.2.0@aar")
implementation("com.github.outsystems:osnotificationpermissions-android:0.0.4@aar")

def roomVersion = "2.4.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ class OSHealthFitness : CordovaImplementation() {
"updateBackgroundJob" -> {
updateBackgroundJob(args)
}
"disconnectFromGoogleFit" -> {
disconnectFromGoogleFit()
}
}
return true
}
Expand Down Expand Up @@ -232,6 +235,17 @@ class OSHealthFitness : CordovaImplementation() {
}
)
}

private fun disconnectFromGoogleFit() {
healthStore?.disconnectFromGoogleFit(
{
sendPluginResult("success", null)
},
{
sendPluginResult(null, Pair(it.code.toString(), it.message))
}
)
}

override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent) {
//super.onActivityResult(requestCode, resultCode, intent)
Expand Down
10 changes: 5 additions & 5 deletions src/ios/frameworks/OSHealthFitnessLib.xcframework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>OSHealthFitnessLib.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>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>OSHealthFitnessLib.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>
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Generated by Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)
#if 0
#elif defined(__arm64__) && __arm64__
// Generated by Apple Swift version 5.7.1 (swiftlang-5.7.1.135.3 clang-1400.0.29.51)
#ifndef OSHEALTHFITNESSLIB_SWIFT_H
#define OSHEALTHFITNESSLIB_SWIFT_H
#pragma clang diagnostic push
Expand All @@ -21,11 +23,20 @@
# include <swift/objc-prologue.h>
#endif

#pragma clang diagnostic ignored "-Wduplicate-method-match"
#pragma clang diagnostic ignored "-Wauto-import"
#if defined(__OBJC__)
#include <Foundation/Foundation.h>
#endif
#if defined(__cplusplus)
#include <cstdint>
#include <cstddef>
#include <cstdbool>
#else
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
#endif

#if !defined(SWIFT_TYPEDEFS)
# define SWIFT_TYPEDEFS 1
Expand Down Expand Up @@ -181,30 +192,56 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
#else
# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
#endif
#if defined(__OBJC__)
#if !defined(IBSegueAction)
# define IBSegueAction
#endif
#endif
#if !defined(SWIFT_EXTERN)
# if defined(__cplusplus)
# define SWIFT_EXTERN extern "C"
# else
# define SWIFT_EXTERN extern
# endif
#endif
#if !defined(SWIFT_CALL)
# define SWIFT_CALL __attribute__((swiftcall))
#endif
#if defined(__cplusplus)
#if !defined(SWIFT_NOEXCEPT)
# define SWIFT_NOEXCEPT noexcept
#endif
#else
#if !defined(SWIFT_NOEXCEPT)
# define SWIFT_NOEXCEPT
#endif
#endif
#if defined(__cplusplus)
#if !defined(SWIFT_CXX_INT_DEFINED)
#define SWIFT_CXX_INT_DEFINED
namespace swift {
using Int = ptrdiff_t;
using UInt = size_t;
}
#endif
#endif
#if defined(__OBJC__)
#if __has_feature(modules)
#if __has_warning("-Watimport-in-framework-header")
#pragma clang diagnostic ignored "-Watimport-in-framework-header"
#endif
@import CoreData;
#endif

#endif
#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
#pragma clang diagnostic ignored "-Wduplicate-method-arg"
#if __has_warning("-Wpragma-clang-attribute")
# pragma clang diagnostic ignored "-Wpragma-clang-attribute"
#endif
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wnullability"
#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"

#if __has_attribute(external_source_symbol)
# pragma push_macro("any")
Expand All @@ -213,6 +250,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
# pragma pop_macro("any")
#endif

#if defined(__OBJC__)
@class NSEntityDescription;
@class NSManagedObjectContext;

Expand Down Expand Up @@ -258,8 +296,15 @@ SWIFT_CLASS("_TtC18OSHealthFitnessLib12Notification")
@property (nonatomic, strong) BackgroundJob * _Nullable relationship;
@end

#endif
#if defined(__cplusplus)
#endif
#if __has_attribute(external_source_symbol)
# pragma clang attribute pop
#endif
#pragma clang diagnostic pop
#endif

#else
#error unsupported Swift architecture
#endif
Binary file not shown.
Loading

0 comments on commit 1f8dde7

Please sign in to comment.