@tryvital/vital-health-react-native 5.4.2 → 5.5.0

package/android/build.gradle

@@ -129,7 +129,7 @@ repositories {
 }
 
 def kotlin_version = getExtOrDefault('kotlinVersion')
-def vital_sdk_version = '4.2.2'
+def vital_sdk_version = '4.3.2'
 
 dependencies {
     //noinspection GradleDynamicVersion

package/android/gradle.properties

@@ -1,4 +1,4 @@
-VitalHealthReactNative_kotlinVersion=1.8.10
+VitalHealthReactNative_kotlinVersion=2.0.21
 VitalHealthReactNative_minSdkVersion=26
 VitalHealthReactNative_targetSdkVersion=31
 VitalHealthReactNative_compileSdkVersion=31

package/android/src/main/java/com/vitalhealthreactnative/VitalHealthReactNativeModule.kt

@@ -24,6 +24,11 @@ import io.tryvital.vitalhealthconnect.disableBackgroundSync
 import io.tryvital.vitalhealthconnect.enableBackgroundSyncContract
 import io.tryvital.vitalhealthconnect.isBackgroundSyncEnabled
 import io.tryvital.vitalhealthconnect.model.*
+import io.tryvital.vitalhealthcore.model.ConnectionPolicy
+import io.tryvital.vitalhealthcore.model.ProviderAvailability
+import io.tryvital.vitalhealthcore.model.SyncStatus
+import io.tryvital.vitalhealthcore.model.VitalResource
+import io.tryvital.vitalhealthcore.model.WritableVitalResource
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -32,7 +37,6 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import java.time.Instant
-import java.util.Locale
 import java.util.concurrent.atomic.AtomicReference
 import kotlin.time.Duration.Companion.milliseconds
 
@@ -60,7 +64,7 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun isAvailable(promise: Promise) = runOnMain {
     val availability = VitalHealthConnectManager.isAvailable(reactApplicationContext)
-    promise.resolve(availability == HealthConnectAvailability.Installed)
+    promise.resolve(availability == ProviderAvailability.Installed)
   }
 
   @ReactMethod
@@ -75,7 +79,7 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
 
     val availability = VitalHealthConnectManager.isAvailable(reactApplicationContext)
 
-    if (availability != HealthConnectAvailability.Installed) {
+    if (availability != ProviderAvailability.Installed) {
       return@runOnMain promise.reject(
           VITAL_HEALTH_ERROR,
           "Health Connect is unavailable: $availability",
@@ -114,7 +118,7 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
       )
     }
 
-    val activity = currentActivity ?: return@runOnMain promise.reject(
+    val activity = reactApplicationContext.currentActivity ?: return@runOnMain promise.reject(
       VITAL_HEALTH_ERROR,
       "Cannot find the current ReactNative Activity"
     )
@@ -260,7 +264,7 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
       )
     }
 
-    val activity = currentActivity ?: return@runOnMain promise.reject(
+    val activity = reactApplicationContext.currentActivity ?: return@runOnMain promise.reject(
       VITAL_HEALTH_ERROR,
       "Cannot find the current ReactNative Activity"
     )
@@ -374,7 +378,7 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun openPlatformHealthApp(promise: Promise) = runOnMain {
-    val activity = currentActivity ?: return@runOnMain promise.reject(
+    val activity = reactApplicationContext.currentActivity ?: return@runOnMain promise.reject(
       VITAL_HEALTH_ERROR,
       "No active Android Activity"
     )
@@ -513,7 +517,7 @@ class VitalHealthReactNativeModule(reactContext: ReactApplicationContext) :
       val module = reactInstanceManager.currentReactContext?.getNativeModule(VitalHealthReactNativeModule::class.java) ?: return
 
       if (synchronized(module) { module.askForPermission != null }) {
-        val activity = module.currentActivity as ComponentActivity
+        val activity = module.reactApplicationContext.currentActivity as? ComponentActivity ?: return
 
         // Lifted from ComponentActivity.onRequestPermissionsResult
         activity.activityResultRegistry.dispatchResult(

package/app.plugin.js

@@ -3,8 +3,8 @@ const {
   withInfoPlist,
   withAndroidManifest,
   withAppDelegate,
-} = require('@expo/config-plugins');
-const { withPlugins } = require('@expo/config-plugins');
+} = require('expo/config-plugins');
+const { withPlugins } = require('expo/config-plugins');
 const { addObjcImports, insertContentsInsideObjcFunctionBlock, addSwiftImports, insertContentsInsideSwiftFunctionBlock } = require('@expo/config-plugins/build/ios/codeMod');
 
 const HEALTH_SHARE = 'Allow $(PRODUCT_NAME) to check health info';

package/lib/commonjs/app.plugin.js

@@ -3,8 +3,8 @@ const {
   withInfoPlist,
   withAndroidManifest,
   withAppDelegate,
-} = require('@expo/config-plugins');
-const { withPlugins } = require('@expo/config-plugins');
+} = require('expo/config-plugins');
+const { withPlugins } = require('expo/config-plugins');
 const { addObjcImports, insertContentsInsideObjcFunctionBlock, addSwiftImports, insertContentsInsideSwiftFunctionBlock } = require('@expo/config-plugins/build/ios/codeMod');
 
 const HEALTH_SHARE = 'Allow $(PRODUCT_NAME) to check health info';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryvital/vital-health-react-native",
-  "version": "5.4.2",
+  "version": "5.5.0",
   "description": "Client to access iOS's HealthKit and Android HealthConnect",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -50,11 +50,12 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tryvital/vital-core-react-native": "5.4.2"
+    "@tryvital/vital-core-react-native": "5.5.0"
   },
   "peerDependencies": {
     "react": "*",
-    "react-native": "*"
+    "react-native": "*",
+    "expo": "*"
   },
   "devDependencies": {
     "@react-native-community/eslint-config": "^3.0.2",

package/vital-health-react-native.podspec

@@ -1,7 +1,6 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
   s.name         = "vital-health-react-native"
@@ -16,21 +15,7 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
-  s.dependency "React-Core"
-  s.dependency "VitalHealthKit", "~> 1.8.2"
+  s.dependency "VitalHealthKit", "~> 1.8.6"
 
-  # Don't install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
-  end
+  install_modules_dependencies(s)
 end