@purchasely/cordova-plugin-purchasely 6.0.0-rc.1 → 6.0.0-rc.3

package/example/config.xml

@@ -18,7 +18,7 @@
     <platform name="android">
         <allow-intent href="market:*" />
         <preference name="GradlePluginKotlinEnabled" value="true" />
-        <preference name="GradlePluginKotlinVersion" value="2.1.21" />
+        <preference name="GradlePluginKotlinVersion" value="2.3.21" />
     </platform>
     <platform name="ios">
         <allow-intent href="itms:*" />

package/example/package-lock.json

@@ -19,7 +19,7 @@
     },
     "..": {
       "name": "@purchasely/cordova-plugin-purchasely",
-      "version": "6.0.0-rc.1",
+      "version": "6.0.0-rc.3",
       "dev": true,
       "license": "ISC",
       "devDependencies": {
@@ -36,7 +36,7 @@
     },
     "../../purchasely-google": {
       "name": "@purchasely/cordova-plugin-purchasely-google",
-      "version": "6.0.0-rc.1",
+      "version": "6.0.0-rc.3",
       "dev": true,
       "license": "ISC"
     },
@@ -111,9 +111,9 @@
       }
     },
     "node_modules/android-versions": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.1.2.tgz",
-      "integrity": "sha512-JmyCaE2AWe/1ENDv70Bx1hBiVvkUV/JJYnAH6vFGENXDb2DdmCDMO9icoCvGR9TAsRJ/AuszEcIpyHM6qim3SA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-2.2.0.tgz",
+      "integrity": "sha512-lrad0HHmy9406sSmBHYIetx4n3WMnVVD+HMv7C+YJrByLFGPYWvlM1WcYrYL+e2s1GErvRF85nWsRY7RpwIGLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -236,9 +236,9 @@
       }
     },
     "node_modules/cordova-ios": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-8.1.0.tgz",
-      "integrity": "sha512-IgVtJIQJBJi+QqqrGjx/moY+M9DqO+RQLeIpHGsZD1Xy+mGflDrp7lunmFYqVchV31b8O/aqE4y4AsDUZip04w==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-8.1.1.tgz",
+      "integrity": "sha512-fiowa8HeuVd45ZI2fb2az1qDAqlm3H9ruVcXBDUJ3FneMoMmwKKrsrg2tc5L4C8z2ZTZ3d7+NDl/XqJ2M9Ydyw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -804,14 +804,17 @@
       }
     },
     "node_modules/uuid": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
-      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.1.tgz",
+      "integrity": "sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ==",
       "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
       "license": "MIT",
       "bin": {
-        "uuid": "dist/bin/uuid"
+        "uuid": "dist/esm/bin/uuid"
       }
     },
     "node_modules/which": {

package/example/package.json

@@ -22,7 +22,8 @@
   },
   "overrides": {
     "@xmldom/xmldom": "^0.9.8",
-    "plist": "^3.1.1"
+    "plist": "^3.1.1",
+    "uuid": "^11.1.1"
   },
   "cordova": {
     "plugins": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purchasely/cordova-plugin-purchasely",
-  "version": "6.0.0-rc.1",
+  "version": "6.0.0-rc.3",
   "description": "Purchasely is a solution to ease the integration and boost your In-App Purchases & Subscriptions on the App Store, Google Play Store, Amazon Appstore and Huawei App Gallery.",
   "cordova": {
     "id": "@purchasely/cordova-plugin-purchasely",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@purchasely/cordova-plugin-purchasely" version="6.0.0-rc.1" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="@purchasely/cordova-plugin-purchasely" version="6.0.0-rc.3" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Purchasely</name>
     <js-module name="Purchasely" src="www/Purchasely.js">
         <clobbers target="Purchasely" />
@@ -38,7 +38,7 @@
                 <source url="https://github.com/CocoaPods/Specs.git"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="Purchasely" spec="6.0.0-rc.2"/>
+                <pod name="Purchasely" spec="6.0.0-rc.3"/>
             </pods>
         </podspec>
     </platform>
@@ -49,10 +49,11 @@
             </feature>
             <preference name="AndroidXEnabled" value="true" />
             <preference name="GradlePluginKotlinEnabled" value="true" />
+            <preference name="GradlePluginKotlinVersion" value="2.3.21" />
             <preference name="GradlePluginKotlinCodeStyle" value="official" />
         </config-file>
         <framework src="src/android/build-extras.gradle" custom="true" type="gradleReference" />
-        <framework src="io.purchasely:core:6.0.0-rc.2" />
+        <framework src="io.purchasely:core:6.0.0-rc.3" />
         <source-file src="src/android/PurchaselyPlugin.kt" target-dir="java/cordova/plugin/purchasely" />
     </platform>
 </plugin>

package/src/ios/CDVPurchasely.m

@@ -276,7 +276,7 @@
         [r setKeepCallbackAsBool:YES];
         [strongSelf.commandDelegate sendPluginResult:r callbackId:callbackId];
     }];
-    builder = [builder onClose:^{
+    builder = [builder onCloseRequested:^{
         CDVPurchasely *strongSelf = weakSelf; if (strongSelf == nil) return;
         CDVPluginResult *r = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:@{@"event": @"closeRequested"}];
         [r setKeepCallbackAsBool:YES];
@@ -555,13 +555,13 @@
 
 // Helpers
 
-// v6: builds a PLYDisplayMode from the JS transition object (see normalizeTransition):
+// v6: builds a PLYTransition from the JS transition object (see normalizeTransition):
 //   { type, dismissible?, height?: { type: 'pixel'|'percentage', value }, backgroundColor? }
 // (a bare mode string is also tolerated). Objective-C only exposes percentage height for
 // drawer/popin (pixel height and popin width are Swift-only in the SDK), so those honor a
 // percentage height + dismissible + background colors; other dimensions are ignored.
 // Returns nil for an unknown/absent value so the backend-defined default is honored.
-- (PLYDisplayMode * _Nullable) displayModeFromTransition:(id) transition {
+- (PLYTransition * _Nullable) displayModeFromTransition:(id) transition {
     NSDictionary *map = [transition isKindOfClass:[NSDictionary class]] ? transition : nil;
     NSString *type = map != nil ? map[@"type"] : ([transition isKindOfClass:[NSString class]] ? transition : nil);
     if (![type isKindOfClass:[NSString class]]) {
@@ -593,17 +593,17 @@
     }
 
     if ([type isEqualToString:@"fullScreen"]) {
-        return [PLYDisplayMode fullScreen];
+        return [PLYTransition fullScreen];
     } else if ([type isEqualToString:@"modal"]) {
-        return [PLYDisplayMode modalWithDismissible:dismissible];
+        return [PLYTransition modalWithDismissible:dismissible];
     } else if ([type isEqualToString:@"push"]) {
-        return [PLYDisplayMode push];
+        return [PLYTransition push];
     } else if ([type isEqualToString:@"inlinePaywall"]) {
-        return [PLYDisplayMode inlinePaywall];
+        return [PLYTransition inlinePaywall];
     } else if ([type isEqualToString:@"drawer"]) {
-        return [[PLYDisplayMode alloc] initWithType:PLYDisplayModeTypeDrawer heightPercentage:heightPercentage backgroundColors:backgroundColors dismissible:dismissible];
+        return [[PLYTransition alloc] initWithType:PLYTransitionTypeDrawer heightPercentage:heightPercentage backgroundColors:backgroundColors dismissible:dismissible];
     } else if ([type isEqualToString:@"popin"]) {
-        return [[PLYDisplayMode alloc] initWithType:PLYDisplayModeTypePopin heightPercentage:heightPercentage backgroundColors:backgroundColors dismissible:dismissible];
+        return [[PLYTransition alloc] initWithType:PLYTransitionTypePopin heightPercentage:heightPercentage backgroundColors:backgroundColors dismissible:dismissible];
     }
     return nil;
 }
@@ -736,8 +736,8 @@
         }
         id<PLYPresentation> presentation = info.presentation;
         if (presentation != nil) {
-            if (presentation.id != nil) {
-                [infosResult setObject:presentation.id forKey:@"presentationId"];
+            if (presentation.screenId != nil) {
+                [infosResult setObject:presentation.screenId forKey:@"presentationId"];
             }
             if (presentation.placementId != nil) {
                 [infosResult setObject:presentation.placementId forKey:@"placementId"];
@@ -1176,7 +1176,7 @@ static BOOL PLYPresentationActionFromString(NSString *kind, PLYPresentationActio
             [r setKeepCallbackAsBool:YES];
             [strongSelf.commandDelegate sendPluginResult:r callbackId:callbackId];
         };
-        presentationLoaded.onClose = ^{
+        presentationLoaded.onCloseRequested = ^{
             CDVPurchasely *strongSelf = weakSelf; if (strongSelf == nil) return;
             CDVPluginResult *r = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:@{@"event": @"closeRequested"}];
             [r setKeepCallbackAsBool:YES];
@@ -1224,7 +1224,7 @@ static BOOL PLYPresentationActionFromString(NSString *kind, PLYPresentationActio
 
 - (id<PLYPresentation>) findPresentationLoadedFor:(NSString * _Nullable) presentationId {
     for (id<PLYPresentation> presentationLoaded in self.presentationsLoaded) {
-        if ([presentationLoaded.id isEqualToString: presentationId]) {
+        if ([presentationLoaded.screenId isEqualToString: presentationId]) {
             return presentationLoaded;
         }
     }
@@ -1234,7 +1234,7 @@ static BOOL PLYPresentationActionFromString(NSString *kind, PLYPresentationActio
 - (NSInteger) findIndexPresentationLoadedFor:(NSString * _Nullable) presentationId {
     NSInteger index = 0;
     for (id<PLYPresentation> presentationLoaded in self.presentationsLoaded) {
-        if ([presentationLoaded.id isEqualToString: presentationId]) {
+        if ([presentationLoaded.screenId isEqualToString: presentationId]) {
             return index;
         }
         index++;
@@ -1269,8 +1269,8 @@ static BOOL PLYPresentationActionFromString(NSString *kind, PLYPresentationActio
 
     if (presentation != nil) {
 
-        if (presentation.id != nil) {
-            [presentationResult setObject:presentation.id forKey:@"id"];
+        if (presentation.screenId != nil) {
+            [presentationResult setObject:presentation.screenId forKey:@"id"];
         }
 
         if (presentation.placementId != nil) {

package/www/Purchasely.js

@@ -56,7 +56,7 @@ exports.start = function (options, success, error) {
     var opts = options || {};
     var cordovaSdkVersion = cordova.define.moduleMap['cordova/plugin_list'].exports['metadata']['cordova-plugin-purchasely']
     if(!cordovaSdkVersion) {
-        cordovaSdkVersion = "6.0.0-rc.1";
+        cordovaSdkVersion = "6.0.0-rc.3";
     }
     opts.sdkVersion = cordovaSdkVersion;
     exec(success, error, 'Purchasely', 'start', [opts]);