Merge pull request #47 from Notificare/release/3.6.1

3.6.1
Notificare · Sep 13, 2023 · 438282a · 438282a
2 parents 3469ead + 66a4622
commit 438282a
Show file tree

Hide file tree

Showing 47 changed files with 102 additions and 87 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## 3.6.1
+
+- Fix custom action received event
+
+#### Native changes
+
+##### Android
+
+- Fix race condition when synchronising monitored regions
+
+##### iOS
+
+- Fix race condition when setting the database merge policy eagerly loads the data stores
+- Prevent fatal error when failing to open the databases
+
 ## 3.6.0
 
 - Fix `updateUserData` return type

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.6.0",
+  "version": "3.6.1",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

diff --git a/packages/capacitor-notificare-assets/CapacitorNotificareAssets.podspec b/packages/capacitor-notificare-assets/CapacitorNotificareAssets.podspec
@@ -1,7 +1,7 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-notificare_version = '3.6.0'
+notificare_version = '3.6.1'
 
 Pod::Spec.new do |s|
   s.name = 'CapacitorNotificareAssets'

diff --git a/packages/capacitor-notificare-assets/android/build.gradle b/packages/capacitor-notificare-assets/android/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
 
-    def notificare_version = '3.6.0'
+    def notificare_version = '3.6.1'
     api "re.notifica:notificare:$notificare_version"
     api "re.notifica:notificare-assets:$notificare_version"
 }
diff --git a/packages/capacitor-notificare-assets/ios/Podfile b/packages/capacitor-notificare-assets/ios/Podfile
@@ -6,8 +6,8 @@ def capacitor_pods
   pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
 
-  pod 'Notificare/NotificareKit', '3.6.0'
-  pod 'Notificare/NotificareAssetsKit', '3.6.0'
+  pod 'Notificare/NotificareKit', '3.6.1'
+  pod 'Notificare/NotificareAssetsKit', '3.6.1'
 end
 
 target 'Plugin' do

diff --git a/packages/capacitor-notificare-assets/package.json b/packages/capacitor-notificare-assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-notificare-assets",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Notificare Assets Capacitor plugin.",
   "author": "Notificare <info@notifica.re> (https://notificare.com)",
   "license": "MIT",
@@ -49,15 +49,15 @@
     "docs:replace-symbolic-links": "rm README.md CHANGELOG.md MIGRATION.md; cp ../../README.md ../../CHANGELOG.md ../../MIGRATION.md ."
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.0.0",
-    "capacitor-notificare": "3.6.0"
+    "@capacitor/core": "3 - 5",
+    "capacitor-notificare": "3.6.1"
   },
   "devDependencies": {
     "@capacitor/android": "^3.0.0",
     "@capacitor/core": "^3.0.0",
     "@capacitor/docgen": "^0.0.18",
     "@capacitor/ios": "^3.0.0",
-    "capacitor-notificare": "3.6.0",
+    "capacitor-notificare": "3.6.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.32.0",
     "typescript": "^4.5.4"

diff --git a/packages/capacitor-notificare-geo/CapacitorNotificareGeo.podspec b/packages/capacitor-notificare-geo/CapacitorNotificareGeo.podspec
@@ -1,7 +1,7 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-notificare_version = '3.6.0'
+notificare_version = '3.6.1'
 
 Pod::Spec.new do |s|
   s.name = 'CapacitorNotificareGeo'

diff --git a/packages/capacitor-notificare-geo/android/build.gradle b/packages/capacitor-notificare-geo/android/build.gradle
@@ -55,7 +55,7 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.5.1'
 
-    def notificare_version = '3.6.0'
+    def notificare_version = '3.6.1'
     api "re.notifica:notificare:$notificare_version"
     api "re.notifica:notificare-geo:$notificare_version"
     implementation "re.notifica:notificare-geo-gms:$notificare_version"

diff --git a/packages/capacitor-notificare-geo/ios/Podfile b/packages/capacitor-notificare-geo/ios/Podfile
@@ -6,8 +6,8 @@ def capacitor_pods
   pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
 
-  pod 'Notificare/NotificareKit', '3.6.0'
-  pod 'Notificare/NotificareGeoKit', '3.6.0'
+  pod 'Notificare/NotificareKit', '3.6.1'
+  pod 'Notificare/NotificareGeoKit', '3.6.1'
 end
 
 target 'Plugin' do

diff --git a/packages/capacitor-notificare-geo/package.json b/packages/capacitor-notificare-geo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-notificare-geo",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Notificare Geo Capacitor plugin.",
   "author": "Notificare <info@notifica.re> (https://notificare.com)",
   "license": "MIT",
@@ -49,15 +49,15 @@
     "docs:replace-symbolic-links": "rm README.md CHANGELOG.md MIGRATION.md; cp ../../README.md ../../CHANGELOG.md ../../MIGRATION.md ."
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.0.0",
-    "capacitor-notificare": "3.6.0"
+    "@capacitor/core": "3 - 5",
+    "capacitor-notificare": "3.6.1"
   },
   "devDependencies": {
     "@capacitor/android": "^3.0.0",
     "@capacitor/core": "^3.0.0",
     "@capacitor/docgen": "^0.0.18",
     "@capacitor/ios": "^3.0.0",
-    "capacitor-notificare": "3.6.0",
+    "capacitor-notificare": "3.6.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.32.0",
     "typescript": "^4.5.4"

diff --git a/packages/capacitor-notificare-in-app-messaging/CapacitorNotificareInAppMessaging.podspec b/packages/capacitor-notificare-in-app-messaging/CapacitorNotificareInAppMessaging.podspec
@@ -1,7 +1,7 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-notificare_version = '3.6.0'
+notificare_version = '3.6.1'
 
 Pod::Spec.new do |s|
   s.name = 'CapacitorNotificareInAppMessaging'

diff --git a/packages/capacitor-notificare-in-app-messaging/android/build.gradle b/packages/capacitor-notificare-in-app-messaging/android/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.5.1'
 
-    def notificare_version = '3.6.0'
+    def notificare_version = '3.6.1'
     api "re.notifica:notificare:$notificare_version"
     api "re.notifica:notificare-in-app-messaging:$notificare_version"
 }
diff --git a/packages/capacitor-notificare-in-app-messaging/ios/Podfile b/packages/capacitor-notificare-in-app-messaging/ios/Podfile
@@ -6,8 +6,8 @@ def capacitor_pods
   pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
 
-  pod 'Notificare/NotificareKit', '3.6.0'
-  pod 'Notificare/NotificareInAppMessagingKit', '3.6.0'
+  pod 'Notificare/NotificareKit', '3.6.1'
+  pod 'Notificare/NotificareInAppMessagingKit', '3.6.1'
 end
 
 target 'Plugin' do

diff --git a/packages/capacitor-notificare-in-app-messaging/package.json b/packages/capacitor-notificare-in-app-messaging/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-notificare-in-app-messaging",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Notificare In-App Messaging Capacitor plugin.",
   "author": "Notificare <info@notifica.re> (https://notificare.com)",
   "license": "MIT",
@@ -49,15 +49,15 @@
     "docs:replace-symbolic-links": "rm README.md CHANGELOG.md MIGRATION.md; cp ../../README.md ../../CHANGELOG.md ../../MIGRATION.md ."
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.0.0",
-    "capacitor-notificare": "3.6.0"
+    "@capacitor/core": "3 - 5",
+    "capacitor-notificare": "3.6.1"
   },
   "devDependencies": {
     "@capacitor/android": "^3.0.0",
     "@capacitor/core": "^3.0.0",
     "@capacitor/docgen": "^0.0.18",
     "@capacitor/ios": "^3.0.0",
-    "capacitor-notificare": "3.6.0",
+    "capacitor-notificare": "3.6.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.32.0",
     "typescript": "^4.5.4"

diff --git a/packages/capacitor-notificare-inbox/CapacitorNotificareInbox.podspec b/packages/capacitor-notificare-inbox/CapacitorNotificareInbox.podspec
@@ -1,7 +1,7 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-notificare_version = '3.6.0'
+notificare_version = '3.6.1'
 
 Pod::Spec.new do |s|
   s.name = 'CapacitorNotificareInbox'

diff --git a/packages/capacitor-notificare-inbox/android/build.gradle b/packages/capacitor-notificare-inbox/android/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 
     implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1'
 
-    def notificare_version = '3.6.0'
+    def notificare_version = '3.6.1'
     api "re.notifica:notificare:$notificare_version"
     api "re.notifica:notificare-inbox:$notificare_version"
 }
diff --git a/packages/capacitor-notificare-inbox/ios/Podfile b/packages/capacitor-notificare-inbox/ios/Podfile
@@ -6,8 +6,8 @@ def capacitor_pods
   pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
 
-  pod 'Notificare/NotificareKit', '3.6.0'
-  pod 'Notificare/NotificareInboxKit', '3.6.0'
+  pod 'Notificare/NotificareKit', '3.6.1'
+  pod 'Notificare/NotificareInboxKit', '3.6.1'
 end
 
 target 'Plugin' do

diff --git a/packages/capacitor-notificare-inbox/package.json b/packages/capacitor-notificare-inbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-notificare-inbox",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Notificare Inbox Capacitor plugin.",
   "author": "Notificare <info@notifica.re> (https://notificare.com)",
   "license": "MIT",
@@ -49,15 +49,15 @@
     "docs:replace-symbolic-links": "rm README.md CHANGELOG.md MIGRATION.md; cp ../../README.md ../../CHANGELOG.md ../../MIGRATION.md ."
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.0.0",
-    "capacitor-notificare": "3.6.0"
+    "@capacitor/core": "3 - 5",
+    "capacitor-notificare": "3.6.1"
   },
   "devDependencies": {
     "@capacitor/android": "^3.0.0",
     "@capacitor/core": "^3.0.0",
     "@capacitor/docgen": "^0.0.18",
     "@capacitor/ios": "^3.0.0",
-    "capacitor-notificare": "3.6.0",
+    "capacitor-notificare": "3.6.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.32.0",
     "typescript": "^4.5.4"

diff --git a/packages/capacitor-notificare-loyalty/CapacitorNotificareLoyalty.podspec b/packages/capacitor-notificare-loyalty/CapacitorNotificareLoyalty.podspec
@@ -1,7 +1,7 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-notificare_version = '3.6.0'
+notificare_version = '3.6.1'
 
 Pod::Spec.new do |s|
   s.name = 'CapacitorNotificareLoyalty'

diff --git a/packages/capacitor-notificare-loyalty/android/build.gradle b/packages/capacitor-notificare-loyalty/android/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.5.1'
 
-    def notificare_version = '3.6.0'
+    def notificare_version = '3.6.1'
     api "re.notifica:notificare:$notificare_version"
     api "re.notifica:notificare-loyalty:$notificare_version"
 }
diff --git a/packages/capacitor-notificare-loyalty/ios/Podfile b/packages/capacitor-notificare-loyalty/ios/Podfile
@@ -6,8 +6,8 @@ def capacitor_pods
   pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
 
-  pod 'Notificare/NotificareKit', '3.6.0'
-  pod 'Notificare/NotificareLoyaltyKit', '3.6.0'
+  pod 'Notificare/NotificareKit', '3.6.1'
+  pod 'Notificare/NotificareLoyaltyKit', '3.6.1'
 end
 
 target 'Plugin' do

diff --git a/packages/capacitor-notificare-loyalty/package.json b/packages/capacitor-notificare-loyalty/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-notificare-loyalty",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Notificare Loyalty Capacitor plugin.",
   "author": "Notificare <info@notifica.re> (https://notificare.com)",
   "license": "MIT",
@@ -49,15 +49,15 @@
     "docs:replace-symbolic-links": "rm README.md CHANGELOG.md MIGRATION.md; cp ../../README.md ../../CHANGELOG.md ../../MIGRATION.md ."
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.0.0",
-    "capacitor-notificare": "3.6.0"
+    "@capacitor/core": "3 - 5",
+    "capacitor-notificare": "3.6.1"
   },
   "devDependencies": {
     "@capacitor/android": "^3.0.0",
     "@capacitor/core": "^3.0.0",
     "@capacitor/docgen": "^0.0.18",
     "@capacitor/ios": "^3.0.0",
-    "capacitor-notificare": "3.6.0",
+    "capacitor-notificare": "3.6.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.32.0",
     "typescript": "^4.5.4"

diff --git a/packages/capacitor-notificare-monetize/CapacitorNotificareMonetize.podspec b/packages/capacitor-notificare-monetize/CapacitorNotificareMonetize.podspec
@@ -1,7 +1,7 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-notificare_version = '3.6.0'
+notificare_version = '3.6.1'
 
 Pod::Spec.new do |s|
   s.name = 'CapacitorNotificareMonetize'

diff --git a/packages/capacitor-notificare-monetize/android/build.gradle b/packages/capacitor-notificare-monetize/android/build.gradle
@@ -55,7 +55,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1'
 
-    def notificare_version = '3.6.0'
+    def notificare_version = '3.6.1'
     api "re.notifica:notificare:$notificare_version"
     api "re.notifica:notificare-monetize:$notificare_version"
     implementation "re.notifica:notificare-monetize-gms:$notificare_version"

diff --git a/packages/capacitor-notificare-monetize/ios/Podfile b/packages/capacitor-notificare-monetize/ios/Podfile
@@ -6,8 +6,8 @@ def capacitor_pods
   pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
 
-  pod 'Notificare/NotificareKit', '3.6.0'
-  pod 'Notificare/NotificareMonetizeKit', '3.6.0'
+  pod 'Notificare/NotificareKit', '3.6.1'
+  pod 'Notificare/NotificareMonetizeKit', '3.6.1'
 end
 
 target 'Plugin' do

diff --git a/packages/capacitor-notificare-monetize/package.json b/packages/capacitor-notificare-monetize/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-notificare-monetize",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Notificare Monetize Capacitor plugin.",
   "author": "Notificare <info@notifica.re> (https://notificare.com)",
   "license": "MIT",
@@ -49,15 +49,15 @@
     "docs:replace-symbolic-links": "rm README.md CHANGELOG.md MIGRATION.md; cp ../../README.md ../../CHANGELOG.md ../../MIGRATION.md ."
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.0.0",
-    "capacitor-notificare": "3.6.0"
+    "@capacitor/core": "3 - 5",
+    "capacitor-notificare": "3.6.1"
   },
   "devDependencies": {
     "@capacitor/android": "^3.0.0",
     "@capacitor/core": "^3.0.0",
     "@capacitor/docgen": "^0.0.18",
     "@capacitor/ios": "^3.0.0",
-    "capacitor-notificare": "3.6.0",
+    "capacitor-notificare": "3.6.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.32.0",
     "typescript": "^4.5.4"

diff --git a/packages/capacitor-notificare-push-ui/CapacitorNotificarePushUi.podspec b/packages/capacitor-notificare-push-ui/CapacitorNotificarePushUi.podspec
@@ -1,7 +1,7 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-notificare_version = '3.6.0'
+notificare_version = '3.6.1'
 
 Pod::Spec.new do |s|
   s.name = 'CapacitorNotificarePushUi'

diff --git a/packages/capacitor-notificare-push-ui/android/build.gradle b/packages/capacitor-notificare-push-ui/android/build.gradle
@@ -55,7 +55,7 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.5.1'
 
-    def notificare_version = '3.6.0'
+    def notificare_version = '3.6.1'
     api "re.notifica:notificare:$notificare_version"
     api "re.notifica:notificare-push-ui:$notificare_version"
     implementation "re.notifica:notificare-push-ui-gms:$notificare_version"

diff --git a/packages/capacitor-notificare-push-ui/ios/Plugin/NotificarePushUIPlugin.swift b/packages/capacitor-notificare-push-ui/ios/Plugin/NotificarePushUIPlugin.swift
@@ -222,7 +222,7 @@ extension NotificarePushUIPlugin: NotificarePushUIDelegate {
         }
     }
 
-    public func notificare(_ notificarePushUI: NotificarePushUI, shouldPerformSelectorWithURL url: URL, in action: NotificareNotification.Action, for notification: NotificareNotification) {
+    public func notificare(_ notificarePushUI: NotificarePushUI, didReceiveCustomAction url: URL, in action: NotificareNotification.Action, for notification: NotificareNotification) {
         do {
             EventBroker.instance.dispatchEvent("custom_action_received", data: [
                 "notification": try notification.toJson(),