hypertrack-sdk-react-native 11.0.0 → 11.0.2

package/CHANGELOG.md

@@ -3,7 +3,20 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [11.0.0] - 2023-09-08
+## [11.0.2] - 2023-09-28
+
+### Changed
+
+- Updated HyperTrack Android SDK to 7.0.3
+- Updated HyperTrack iOS SDK to 5.0.2
+
+## [11.0.1] - 2023-09-20
+
+### Fixed
+
+- Fixed setting wrong object format for `setMetadata()`
+
+## [11.0.0] - 2023-09-14
 
 ### Added
 
@@ -580,6 +593,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Initial release.
 
+[11.0.2]: https://github.com/hypertrack/sdk-react-native/releases/tag/11.0.2
+[11.0.1]: https://github.com/hypertrack/sdk-react-native/releases/tag/11.0.1
+[11.0.0]: https://github.com/hypertrack/sdk-react-native/releases/tag/11.0.0
 [10.0.3]: https://github.com/hypertrack/sdk-react-native/releases/tag/10.0.3
 [10.0.2]: https://github.com/hypertrack/sdk-react-native/releases/tag/10.0.2
 [10.0.1]: https://github.com/hypertrack/sdk-react-native/releases/tag/10.0.1

package/LICENSE

@@ -1,8 +1,6 @@
-# License
-
 MIT License
 
-Copyright (c) 2019 HyperTrack
+Copyright (c) 2023 HyperTrack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,9 +1,9 @@
 # React Native HyperTrack SDK
 
-![GitHub](https://img.shields.io/github/license/hypertrack/sdk-react-native.svg)
-![npm](https://img.shields.io/npm/v/hypertrack-sdk-react-native.svg)
-![iOS SDK](https://img.shields.io/badge/iOS%20SDK-5.0.1-brightgreen.svg)
-![Android SDK](https://img.shields.io/badge/Android%20SDK-7.0.1-brightgreen.svg)
+[![GitHub](https://img.shields.io/github/license/hypertrack/sdk-react-native?color=orange)](./LICENSE)
+[![npm](https://img.shields.io/npm/v/hypertrack-sdk-react-native.svg)](https://www.npmjs.com/package/hypertrack-sdk-react-native)
+[![iOS SDK](https://img.shields.io/badge/iOS%20SDK-5.0.2-brightgreen.svg)](https://github.com/hypertrack/sdk-ios)
+[![Android SDK](https://img.shields.io/badge/Android%20SDK-7.0.3-brightgreen.svg)](https://github.com/hypertrack/sdk-android)
 
 [HyperTrack](https://www.hypertrack.com) lets you add live location tracking to your mobile app. Live location is made available along with ongoing activity, tracking controls and tracking outage with reasons.
 

package/android/gradle.properties

@@ -2,5 +2,5 @@ HyperTrackSdk_kotlinVersion=1.6.21
 HyperTrackSdk_minSdkVersion=23
 HyperTrackSdk_targetSdkVersion=30
 HyperTrackSdk_compileSdkVersion=31
-HyperTrackSdk_HyperTrackSDKVersion=7.0.1
+HyperTrackSdk_HyperTrackSDKVersion=7.0.3
 android.useAndroidX=true

package/hypertrack-sdk-react-native.podspec

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

package/ios/common/HyperTrackSDKWrapper.swift

@@ -31,27 +31,16 @@ func getDeviceID() -> Result<SuccessResult, FailureResult> {
     .success(.dict(serializeDeviceID(HyperTrack.deviceID)))
 }
 
-func getName() -> Result<SuccessResult, FailureResult> {
-    .success(.dict(serializeName(HyperTrack.name)))
-}
-
-func setName(_ args: [String: Any]) -> Result<SuccessResult, FailureResult> {
-    deserializeName(args).flatMap { (name: String) in
-        .success(asVoid(HyperTrack.name = name))
-    }
+func getErrors() -> Result<SuccessResult, FailureResult> {
+    .success(.array(serializeErrors(HyperTrack.errors)))
 }
 
 func getMetadata() -> Result<SuccessResult, FailureResult> {
     .success(.dict(serializeMetadata(HyperTrack.metadata)))
 }
 
-func setMetadata(_ map: [String: Any]) -> Result<SuccessResult, FailureResult> {
-    if let metadata = toJSON(map) {
-        HyperTrack.metadata = metadata
-        return .success(.void)
-    } else {
-        return .failure(.error("Failed to deserialize metadata"))
-    }
+func getName() -> Result<SuccessResult, FailureResult> {
+    .success(.dict(serializeName(HyperTrack.name)))
 }
 
 func getLocation() -> Result<SuccessResult, FailureResult> {
@@ -80,8 +69,21 @@ func setIsTracking(_ args: [String: Any]) -> Result<SuccessResult, FailureResult
     }
 }
 
-func getErrors() -> Result<SuccessResult, FailureResult> {
-    .success(.array(serializeErrors(HyperTrack.errors)))
+func setMetadata(_ args: [String: Any]) -> Result<SuccessResult, FailureResult> {
+    deserializeMetadata(args).flatMap { map in
+        if let metadata = toJSON(map) {
+            HyperTrack.metadata = metadata
+            return .success(.void)
+        } else {
+            return .failure(.error("Failed to deserialize metadata"))
+        }
+    }
+}
+
+func setName(_ args: [String: Any]) -> Result<SuccessResult, FailureResult> {
+    deserializeName(args).flatMap { name in
+        .success(asVoid(HyperTrack.name = name))
+    }
 }
 
 func asVoid(_: Void) -> SuccessResult {

package/ios/common/Serialization.swift

@@ -69,6 +69,16 @@ func deserializeLocation(_ data: [String: Any]) -> Result<HyperTrack.Location, F
     return .success(.init(latitude: latitude, longitude: longitude))
 }
 
+func deserializeMetadata(_ data: [String: Any]) -> Result<[String: Any], FailureResult> {
+    if data[keyType] as? String != typeMetadata {
+        return .failure(.fatalError(getParseError(data, key: keyType)))
+    }
+    guard let value = data[keyValue] as? [String: Any] else {
+        return .failure(.fatalError(getParseError(data, key: keyValue)))
+    }
+    return .success(value)
+}
+
 func deserializeName(_ data: [String: Any]) -> Result<String, FailureResult> {
     if data[keyType] as? String != typeName {
         return .failure(.fatalError(getParseError(data, key: keyType)))

package/package.json

@@ -1,163 +1,163 @@
 {
-    "name": "hypertrack-sdk-react-native",
-    "version": "11.0.0",
-    "description": "React Native HyperTrack SDK is a wrapper around native iOS and Android SDKs that allows to integrate HyperTrack into React Native apps.",
-    "main": "lib/commonjs/index",
-    "module": "lib/module/index",
-    "types": "lib/typescript/index.d.ts",
-    "react-native": "src/index",
-    "source": "src/index",
-    "files": [
-        "src",
-        "lib",
-        "android",
-        "ios",
-        "cpp",
-        "hypertrack-sdk-react-native.podspec",
-        "LICENSE.txt",
-        "README.md",
-        "CHANGELOG.md",
-        "CONTRIBUTING.md",
-        "!lib/typescript/example",
-        "!android/build",
-        "!ios/build",
-        "!**/__tests__",
-        "!**/__fixtures__",
-        "!**/__mocks__"
-    ],
-    "scripts": {
-        "test": "jest",
-        "typescript": "tsc --noEmit",
-        "lint": "eslint \"**/*.{js,ts,tsx}\"",
-        "prepare": "bob build",
-        "release": "release-it",
-        "docs": "typedoc --options typedoc.json",
-        "bootstrap": "yarn && yarn docs"
-    },
-    "keywords": [
-        "react-native",
-        "ios",
-        "android",
-        "hypertrack",
-        "location",
-        "tracking"
-    ],
-    "repository": "https://github.com/hypertrack/sdk-react-native",
-    "author": "HyperTrack <help@hypertrack.com> (https://hypertrack.com)",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/hypertrack/sdk-react-native/issues"
-    },
-    "homepage": "https://github.com/hypertrack/sdk-react-native#readme",
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org/"
+  "name": "hypertrack-sdk-react-native",
+  "version": "11.0.2",
+  "description": "React Native HyperTrack SDK is a wrapper around native iOS and Android SDKs that allows to integrate HyperTrack into React Native apps.",
+  "main": "lib/commonjs/index",
+  "module": "lib/module/index",
+  "types": "lib/typescript/index.d.ts",
+  "react-native": "src/index",
+  "source": "src/index",
+  "files": [
+    "src",
+    "lib",
+    "android",
+    "ios",
+    "cpp",
+    "hypertrack-sdk-react-native.podspec",
+    "LICENSE.txt",
+    "README.md",
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    "!lib/typescript/example",
+    "!android/build",
+    "!ios/build",
+    "!**/__tests__",
+    "!**/__fixtures__",
+    "!**/__mocks__"
+  ],
+  "scripts": {
+    "test": "jest",
+    "typescript": "tsc --noEmit",
+    "lint": "eslint \"**/*.{js,ts,tsx}\"",
+    "prepare": "bob build",
+    "release": "release-it",
+    "docs": "typedoc --options typedoc.json",
+    "bootstrap": "yarn && yarn docs"
+  },
+  "keywords": [
+    "react-native",
+    "ios",
+    "android",
+    "hypertrack",
+    "location",
+    "tracking"
+  ],
+  "repository": "https://github.com/hypertrack/sdk-react-native",
+  "author": "HyperTrack <help@hypertrack.com> (https://hypertrack.com)",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/hypertrack/sdk-react-native/issues"
+  },
+  "homepage": "https://github.com/hypertrack/sdk-react-native#readme",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "devDependencies": {
+    "@babel/eslint-parser": "^7.18.2",
+    "@commitlint/config-conventional": "^17.0.2",
+    "@react-native-community/eslint-config": "^3.0.2",
+    "@release-it/bumper": "^4.0.0",
+    "@release-it/conventional-changelog": "^5.1.0",
+    "@types/jest": "^28.1.2",
+    "@types/react": "~17.0.21",
+    "@types/react-native": "0.68.0",
+    "@typescript-eslint/parser": "^5.30.5",
+    "auto-changelog": "^2.4.0",
+    "commitlint": "^17.0.2",
+    "eslint": "^8.4.1",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "jest": "^28.1.1",
+    "pod-install": "^0.1.0",
+    "prettier": "^2.0.5",
+    "react": "^18.0.0",
+    "react-native": "^0.70.0",
+    "react-native-builder-bob": "^0.18.3",
+    "release-it": "^15.4.1",
+    "typedoc": "^0.23.14",
+    "typedoc-plugin-merge-modules": "^4.0.0",
+    "typedoc-plugin-rename-defaults": "^0.6.1",
+    "typescript": "^4.5.2"
+  },
+  "resolutions": {
+    "@types/react": "17.0.21"
+  },
+  "peerDependencies": {
+    "react": "*",
+    "react-native": "*"
+  },
+  "jest": {
+    "preset": "react-native",
+    "modulePathIgnorePatterns": [
+      "<rootDir>/lib/"
+    ]
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "release-it": {
+    "git": {
+      "changelog": "auto-changelog --stdout --commit-limit false --unreleased --template https://raw.githubusercontent.com/release-it/release-it/master/templates/changelog-compact.hbs",
+      "commitMessage": "Release ${version}",
+      "requireCleanWorkingDir": false,
+      "tagName": "${version}",
+      "requireCommits": true
     },
-    "devDependencies": {
-        "@babel/eslint-parser": "^7.18.2",
-        "@commitlint/config-conventional": "^17.0.2",
-        "@react-native-community/eslint-config": "^3.0.2",
-        "@release-it/bumper": "^4.0.0",
-        "@release-it/conventional-changelog": "^5.1.0",
-        "@types/jest": "^28.1.2",
-        "@types/react": "~17.0.21",
-        "@types/react-native": "0.68.0",
-        "@typescript-eslint/parser": "^5.30.5",
-        "auto-changelog": "^2.4.0",
-        "commitlint": "^17.0.2",
-        "eslint": "^8.4.1",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-plugin-prettier": "^4.0.0",
-        "jest": "^28.1.1",
-        "pod-install": "^0.1.0",
-        "prettier": "^2.0.5",
-        "react": "^18.0.0",
-        "react-native": "^0.70.0",
-        "react-native-builder-bob": "^0.18.3",
-        "release-it": "^15.4.1",
-        "typedoc": "^0.23.14",
-        "typedoc-plugin-merge-modules": "^4.0.0",
-        "typedoc-plugin-rename-defaults": "^0.6.1",
-        "typescript": "^4.5.2"
+    "github": {
+      "release": true
     },
-    "resolutions": {
-        "@types/react": "17.0.21"
+    "hooks": {
+      "after:bump": "auto-changelog --package --commit-limit false --template https://raw.githubusercontent.com/release-it/release-it/master/templates/keepachangelog.hbs"
     },
-    "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
-    },
-    "jest": {
-        "preset": "react-native",
-        "modulePathIgnorePatterns": [
-            "<rootDir>/lib/"
-        ]
-    },
-    "commitlint": {
-        "extends": [
-            "@commitlint/config-conventional"
-        ]
-    },
-    "release-it": {
-        "git": {
-            "changelog": "auto-changelog --stdout --commit-limit false --unreleased --template https://raw.githubusercontent.com/release-it/release-it/master/templates/changelog-compact.hbs",
-            "commitMessage": "Release ${version}",
-            "requireCleanWorkingDir": false,
-            "tagName": "${version}",
-            "requireCommits": true
-        },
-        "github": {
-            "release": true
-        },
-        "hooks": {
-            "after:bump": "auto-changelog --package --commit-limit false --template https://raw.githubusercontent.com/release-it/release-it/master/templates/keepachangelog.hbs"
-        },
-        "npm": {
-            "publish": true
-        }
-    },
-    "eslintConfig": {
-        "root": true,
-        "parser": "@typescript-eslint/parser",
-        "extends": [
-            "@react-native-community",
-            "prettier"
-        ],
-        "rules": {
-            "prettier/prettier": [
-                "error",
-                {
-                    "quoteProps": "consistent",
-                    "singleQuote": true,
-                    "tabWidth": 2,
-                    "trailingComma": "es5",
-                    "useTabs": false
-                }
-            ]
-        }
-    },
-    "eslintIgnore": [
-        "node_modules/",
-        "lib/"
+    "npm": {
+      "publish": true
+    }
+  },
+  "eslintConfig": {
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "extends": [
+      "@react-native-community",
+      "prettier"
     ],
-    "prettier": {
-        "quoteProps": "consistent",
-        "singleQuote": true,
-        "tabWidth": 2,
-        "trailingComma": "es5",
-        "useTabs": false
-    },
-    "react-native-builder-bob": {
-        "source": "src",
-        "output": "lib",
-        "targets": [
-            "commonjs",
-            "module",
-            [
-                "typescript",
-                {
-                    "project": "tsconfig.build.json"
-                }
-            ]
-        ]
+    "rules": {
+      "prettier/prettier": [
+        "error",
+        {
+          "quoteProps": "consistent",
+          "singleQuote": true,
+          "tabWidth": 2,
+          "trailingComma": "es5",
+          "useTabs": false
+        }
+      ]
     }
+  },
+  "eslintIgnore": [
+    "node_modules/",
+    "lib/"
+  ],
+  "prettier": {
+    "quoteProps": "consistent",
+    "singleQuote": true,
+    "tabWidth": 2,
+    "trailingComma": "es5",
+    "useTabs": false
+  },
+  "react-native-builder-bob": {
+    "source": "src",
+    "output": "lib",
+    "targets": [
+      "commonjs",
+      "module",
+      [
+        "typescript",
+        {
+          "project": "tsconfig.build.json"
+        }
+      ]
+    ]
+  }
 }

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Thu Apr 13 16:52:30 EEST 2023
-gradle.version=7.2

package/android/.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

package/android/.idea/gradle.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="/usr/local/Cellar/gradle/8.0.2/libexec" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

package/android/.idea/jarRepositories.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="React Native sources" />
-      <option name="name" value="React Native sources" />
-      <option name="url" value="file:$PROJECT_DIR$/../node_modules/react-native/android/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="hypertrack" />
-      <option name="name" value="hypertrack" />
-      <option name="url" value="https://s3-us-west-2.amazonaws.com/m2.hypertrack.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-  </component>
-</project>

package/android/.idea/kotlinc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.6.21" />
-  </component>
-</project>

package/android/.idea/misc.xml

@@ -1,9 +0,0 @@
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="zulu-11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

package/android/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

package/android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Thu Jul 06 15:19:21 EEST 2023
-sdk.dir=/opt/homebrew/share/android-commandlinetools