@tryvital/vital-core-react-native 3.0.5 → 3.0.7

package/android/build.gradle

@@ -11,6 +11,7 @@ buildscript {
     classpath 'com.android.tools.build:gradle:3.5.3'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version+"
   }
 }
 
@@ -20,6 +21,7 @@ def isNewArchitectureEnabled() {
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'com.google.devtools.ksp'
 
 if (isNewArchitectureEnabled()) {
   apply plugin: 'com.facebook.react'
@@ -129,15 +131,16 @@ repositories {
 }
 
 def kotlin_version = getExtOrDefault('kotlinVersion')
-def vital_sdk_version = '1.0.0-beta.27'
+def vital_sdk_version = '1.0.0-beta.28'
 
 dependencies {
+  ksp "com.squareup.moshi:moshi-kotlin-codegen:1.13.0"
+
     //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
   api "com.squareup.moshi:moshi:1.13.0"
-  api "com.squareup.moshi:moshi-kotlin:1.13.0"
   api "com.squareup.moshi:moshi-adapters:1.13.0"
 
   implementation "com.github.tryVital.vital-android:VitalClient:$vital_sdk_version"

package/android/src/main/java/com/vitalcorereactnative/VitalCoreReactNativeModule.kt

@@ -12,7 +12,6 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapter
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import io.tryvital.client.*
 import io.tryvital.client.services.data.DataStage
 import io.tryvital.client.services.data.IngestibleTimeseriesResource
@@ -26,7 +25,6 @@ import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import java.security.Provider
 import java.time.ZoneId
 import java.util.*
 
@@ -36,7 +34,6 @@ internal val moshi by lazy {
   Moshi.Builder()
     .add(ReactNativeTimeSeriesData.adapterFactory())
     .add(Date::class.java, Rfc3339DateJsonAdapter())
-    .addLast(KotlinJsonAdapterFactory())
     .build()
 }
 

package/android/src/main/java/com/vitalcorereactnative/timeSeriesData.kt

@@ -1,13 +1,17 @@
 package com.vitalcorereactnative
 
+import com.squareup.moshi.JsonClass
 import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
 import io.tryvital.client.services.data.BloodPressureSamplePayload
 import io.tryvital.client.services.data.QuantitySamplePayload
 import java.util.*
 
 
+@JsonClass(generateAdapter = false)
 sealed class ReactNativeTimeSeriesData {
+  @JsonClass(generateAdapter = true)
   data class Glucose(val samples: List<ReactNativeQuantitySample>): ReactNativeTimeSeriesData()
+  @JsonClass(generateAdapter = true)
   data class BloodPressure(val samples: List<ReactNativeBloodPressureSample>): ReactNativeTimeSeriesData()
 
   companion object {
@@ -18,6 +22,7 @@ sealed class ReactNativeTimeSeriesData {
   }
 }
 
+@JsonClass(generateAdapter = true)
 data class ReactNativeQuantitySample(
   val id: String?,
   val value: Double,
@@ -42,6 +47,7 @@ data class ReactNativeQuantitySample(
   )
 }
 
+@JsonClass(generateAdapter = true)
 data class ReactNativeBloodPressureSample(
   val systolic: ReactNativeQuantitySample,
   val diastolic: ReactNativeQuantitySample,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryvital/vital-core-react-native",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "test",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/vital-core-react-native.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "VitalCore", "~> 0.10.11"
+  s.dependency "VitalCore", "~> 0.11.1"
 
   # Don't install the dependencies when we run `pod install` in the old architecture.
   if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then

package/android/build/.transforms/0df4ab18586758ca7d61bd48574c9664/results.bin

@@ -1 +0,0 @@
-o/classes

package/android/build/.transforms/27677b99c1e83bd50fe16e156383efa0/results.bin

@@ -1 +0,0 @@
-i/

package/android/build/.transforms/2b3d586dda11028ebe0ec22a3dd7c462/results.bin

@@ -1 +0,0 @@
-o/debug

package/android/build/.transforms/6bcd10d36731d130feb901b6b19ff82d/results.bin

@@ -1 +0,0 @@
-o/out

package/android/build/.transforms/6bcd10d36731d130feb901b6b19ff82d/transformed/out/AndroidManifest.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.vitalcorereactnative" >
-
-    <uses-sdk android:minSdkVersion="26" />
-
-</manifest>

package/android/build/.transforms/6bcd10d36731d130feb901b6b19ff82d/transformed/out/META-INF/com/android/build/gradle/aar-metadata.properties

@@ -1,6 +0,0 @@
-aarFormatVersion=1.0
-aarMetadataVersion=1.0
-minCompileSdk=1
-minCompileSdkExtension=0
-minAndroidGradlePluginVersion=1.0.0
-coreLibraryDesugaringEnabled=false

package/android/build/.transforms/bcf7204f6adc12f6387570e602a50e24/results.bin

@@ -1 +0,0 @@
-i/debug_dex

package/android/build/.transforms/dd68526bb8970190f622cad11a3fc452/results.bin

@@ -1 +0,0 @@
-i/classes_global-synthetics

package/android/build/.transforms/f7b158a4199c5f3a9aa800d2e296e9ae/results.bin

@@ -1 +0,0 @@
-i/

package/android/build/generated/source/buildConfig/debug/com/vitalcorereactnative/BuildConfig.java

@@ -1,12 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.vitalcorereactnative;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.vitalcorereactnative";
-  public static final String BUILD_TYPE = "debug";
-  // Field from default config.
-  public static final boolean IS_NEW_ARCHITECTURE_ENABLED = false;
-}

package/android/build/generated/source/buildConfig/release/com/vitalcorereactnative/BuildConfig.java

@@ -1,12 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.vitalcorereactnative;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = false;
-  public static final String LIBRARY_PACKAGE_NAME = "com.vitalcorereactnative";
-  public static final String BUILD_TYPE = "release";
-  // Field from default config.
-  public static final boolean IS_NEW_ARCHITECTURE_ENABLED = false;
-}

package/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.vitalcorereactnative" >
-
-    <uses-sdk android:minSdkVersion="26" />
-
-</manifest>

package/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json

@@ -1,18 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
-    "kind": "Directory"
-  },
-  "applicationId": "com.vitalcorereactnative",
-  "variantName": "debug",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "outputFile": "AndroidManifest.xml"
-    }
-  ],
-  "elementType": "File"
-}

package/android/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.vitalcorereactnative" >
-
-    <uses-sdk android:minSdkVersion="26" />
-
-</manifest>

package/android/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output-metadata.json

@@ -1,18 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
-    "kind": "Directory"
-  },
-  "applicationId": "com.vitalcorereactnative",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "outputFile": "AndroidManifest.xml"
-    }
-  ],
-  "elementType": "File"
-}

package/android/build/intermediates/aar_metadata/debug/aar-metadata.properties

@@ -1,6 +0,0 @@
-aarFormatVersion=1.0
-aarMetadataVersion=1.0
-minCompileSdk=1
-minCompileSdkExtension=0
-minAndroidGradlePluginVersion=1.0.0
-coreLibraryDesugaringEnabled=false

package/android/build/intermediates/aar_metadata/release/aar-metadata.properties

@@ -1,6 +0,0 @@
-aarFormatVersion=1.0
-aarMetadataVersion=1.0
-minCompileSdk=1
-minCompileSdkExtension=0
-minAndroidGradlePluginVersion=1.0.0
-coreLibraryDesugaringEnabled=false

package/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -1 +0,0 @@
-{}

package/android/build/intermediates/annotation_processor_list/release/annotationProcessors.json

@@ -1 +0,0 @@
-{}

package/android/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-8.2.0

@@ -1,117 +0,0 @@
-# This is a configuration file for ProGuard.
-# http://proguard.sourceforge.net/index.html#manual/usage.html
-#
-# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with
-# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and
-# will be ignored by new version of the Android plugin for Gradle.
-
-# Optimizations: If you don't want to optimize, use the proguard-android.txt configuration file
-# instead of this one, which turns off the optimization flags.
-# Adding optimization introduces certain risks, since for example not all optimizations performed by
-# ProGuard works on all versions of Dalvik.  The following flags turn off various optimizations
-# known to have issues, but the list may not be complete or up to date. (The "arithmetic"
-# optimization can be used if you are only targeting Android 2.0 or later.)  Make sure you test
-# thoroughly if you go this route.
--optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
--optimizationpasses 5
--allowaccessmodification
-
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--verbose
-
-# Preserve some attributes that may be required for reflection.
--keepattributes AnnotationDefault,
-                EnclosingMethod,
-                InnerClasses,
-                RuntimeVisibleAnnotations,
-                RuntimeVisibleParameterAnnotations,
-                RuntimeVisibleTypeAnnotations,
-                Signature
-
--keep public class com.google.vending.licensing.ILicensingService
--keep public class com.android.vending.licensing.ILicensingService
--keep public class com.google.android.vending.licensing.ILicensingService
--dontnote com.android.vending.licensing.ILicensingService
--dontnote com.google.vending.licensing.ILicensingService
--dontnote com.google.android.vending.licensing.ILicensingService
-
-# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
--keepclasseswithmembernames,includedescriptorclasses class * {
-    native <methods>;
-}
-
-# Keep setters in Views so that animations can still work.
--keepclassmembers public class * extends android.view.View {
-    void set*(***);
-    *** get*();
-}
-
-# We want to keep methods in Activity that could be used in the XML attribute onClick.
--keepclassmembers class * extends android.app.Activity {
-    public void *(android.view.View);
-}
-
-# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keepclassmembers class * implements android.os.Parcelable {
-    public static final ** CREATOR;
-}
-
-# Preserve annotated Javascript interface methods.
--keepclassmembers class * {
-    @android.webkit.JavascriptInterface <methods>;
-}
-
-# The support libraries contains references to newer platform versions.
-# Don't warn about those in case this app is linking against an older
-# platform version. We know about them, and they are safe.
--dontnote android.support.**
--dontnote androidx.**
--dontwarn android.support.**
--dontwarn androidx.**
-
-# This class is deprecated, but remains for backward compatibility.
--dontwarn android.util.FloatMath
-
-# Understand the @Keep support annotation.
--keep class android.support.annotation.Keep
--keep class androidx.annotation.Keep
-
--keep @android.support.annotation.Keep class * {*;}
--keep @androidx.annotation.Keep class * {*;}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <methods>;
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <methods>;
-}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <fields>;
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <fields>;
-}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <init>(...);
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <init>(...);
-}
-
-# These classes are duplicated between android.jar and org.apache.http.legacy.jar.
--dontnote org.apache.http.**
--dontnote android.net.http.**
-
-# These classes are duplicated between android.jar and core-lambda-stubs.jar.
--dontnote java.lang.invoke.**

package/android/build/intermediates/default_proguard_files/global/proguard-android.txt-8.2.0

@@ -1,116 +0,0 @@
-# This is a configuration file for ProGuard.
-# http://proguard.sourceforge.net/index.html#manual/usage.html
-#
-# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with
-# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and
-# will be ignored by new version of the Android plugin for Gradle.
-
-# Optimization is turned off by default. Dex does not like code run
-# through the ProGuard optimize steps (and performs some
-# of these optimizations on its own).
-# Note that if you want to enable optimization, you cannot just
-# include optimization flags in your own project configuration file;
-# instead you will need to point to the
-# "proguard-android-optimize.txt" file instead of this one from your
-# project.properties file.
--dontoptimize
-
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--verbose
-
-# Preserve some attributes that may be required for reflection.
--keepattributes AnnotationDefault,
-                EnclosingMethod,
-                InnerClasses,
-                RuntimeVisibleAnnotations,
-                RuntimeVisibleParameterAnnotations,
-                RuntimeVisibleTypeAnnotations,
-                Signature
-
--keep public class com.google.vending.licensing.ILicensingService
--keep public class com.android.vending.licensing.ILicensingService
--keep public class com.google.android.vending.licensing.ILicensingService
--dontnote com.android.vending.licensing.ILicensingService
--dontnote com.google.vending.licensing.ILicensingService
--dontnote com.google.android.vending.licensing.ILicensingService
-
-# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
--keepclasseswithmembernames,includedescriptorclasses class * {
-    native <methods>;
-}
-
-# Keep setters in Views so that animations can still work.
--keepclassmembers public class * extends android.view.View {
-    void set*(***);
-    *** get*();
-}
-
-# We want to keep methods in Activity that could be used in the XML attribute onClick.
--keepclassmembers class * extends android.app.Activity {
-    public void *(android.view.View);
-}
-
-# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keepclassmembers class * implements android.os.Parcelable {
-    public static final ** CREATOR;
-}
-
-# Preserve annotated Javascript interface methods.
--keepclassmembers class * {
-    @android.webkit.JavascriptInterface <methods>;
-}
-
-# The support libraries contains references to newer platform versions.
-# Don't warn about those in case this app is linking against an older
-# platform version. We know about them, and they are safe.
--dontnote android.support.**
--dontnote androidx.**
--dontwarn android.support.**
--dontwarn androidx.**
-
-# This class is deprecated, but remains for backward compatibility.
--dontwarn android.util.FloatMath
-
-# Understand the @Keep support annotation.
--keep class android.support.annotation.Keep
--keep class androidx.annotation.Keep
-
--keep @android.support.annotation.Keep class * {*;}
--keep @androidx.annotation.Keep class * {*;}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <methods>;
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <methods>;
-}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <fields>;
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <fields>;
-}
-
--keepclasseswithmembers class * {
-    @android.support.annotation.Keep <init>(...);
-}
-
--keepclasseswithmembers class * {
-    @androidx.annotation.Keep <init>(...);
-}
-
-# These classes are duplicated between android.jar and org.apache.http.legacy.jar.
--dontnote org.apache.http.**
--dontnote android.net.http.**
-
-# These classes are duplicated between android.jar and core-lambda-stubs.jar.
--dontnote java.lang.invoke.**