Merge pull request #251 Release 3.15.0

Author: StanislavMayorov

android/build.gradle

@@ -110,9 +110,10 @@ def getExtOrDefault(name) {
 def kotlin_version = getExtOrDefault('kotlinVersion')
 
 dependencies {
-    api 'io.adapty:android-sdk:3.14.1'
-    api 'io.adapty:android-ui:3.14.0'
-    api 'io.adapty.internal:crossplatform:3.14.1'
+    implementation platform('io.adapty:adapty-bom:3.15.1')
+    implementation 'io.adapty:android-sdk'
+    implementation 'io.adapty:android-ui'
+    implementation 'io.adapty.internal:crossplatform:3.15.2'
 
     // Compatible with older and newer RN
     //noinspection GradleDynamicVersion

cross_platform.yaml

@@ -1,5 +1,5 @@
 $schema: "https://json-schema.org/draft/2020-12/schema"
-$id: "https://adapty.io/crossPlatform/3.14.0/schema"
+$id: "https://adapty.io/crossPlatform/3.15.1/schema"
 title: "Cross Platform Format"
 
 $requests:
@@ -56,6 +56,8 @@ $requests:
       - onboarding
     properties:
       method: { const: "adapty_ui_create_onboarding_view" }
+      onboarding: { $ref: "#/$defs/AdaptyOnboarding" }
+      external_urls_presentation: { $ref: "#/$defs/AdaptyWebPresentation" }
 
   AdaptyUICreateOnboardingView.Response: #response
     type: object
@@ -401,6 +403,7 @@ $requests:
     required: [method]
     properties:
       method: { const: "open_web_paywall" }
+      open_in: { $ref: "#/$defs/AdaptyWebPresentation", default: "browser_out_app" }
     oneOf:
       - required: [product]
         properties:
@@ -1481,6 +1484,12 @@ $defs:
       - full_screen
       - page_sheet
 
+  AdaptyWebPresentation: #request
+    type: string
+    enum:
+      - browser_out_app
+      - browser_in_app
+
   AdaptyUI.DialogConfiguration: #request
     type: object
     required: [default_action]

examples/AdaptyDevtools/app.json

@@ -1,4 +1,4 @@
 {
-  "name": "AdaptyDevtools",
-  "displayName": "AdaptyDevtools"
+  "name": "AdaptyRnSdkExample",
+  "displayName": "AdaptyRnSdkExample"
 }

examples/AdaptyDevtools/ios/Podfile.lock

@@ -1,19 +1,19 @@
 PODS:
-  - Adapty (3.14.1):
-    - AdaptyLogger (= 3.14.1)
-    - AdaptyUIBuilder (= 3.14.1)
-  - AdaptyLogger (3.14.1)
-  - AdaptyPlugin (3.14.1):
-    - Adapty (= 3.14.1)
-    - AdaptyLogger (= 3.14.1)
-    - AdaptyUI (= 3.14.1)
-    - AdaptyUIBuilder (= 3.14.1)
-  - AdaptyUI (3.14.1):
-    - Adapty (= 3.14.1)
-    - AdaptyLogger (= 3.14.1)
-    - AdaptyUIBuilder (= 3.14.1)
-  - AdaptyUIBuilder (3.14.1):
-    - AdaptyLogger (= 3.14.1)
+  - Adapty (3.15.1):
+    - AdaptyLogger (= 3.15.1)
+    - AdaptyUIBuilder (= 3.15.1)
+  - AdaptyLogger (3.15.1)
+  - AdaptyPlugin (3.15.1):
+    - Adapty (= 3.15.1)
+    - AdaptyLogger (= 3.15.1)
+    - AdaptyUI (= 3.15.1)
+    - AdaptyUIBuilder (= 3.15.1)
+  - AdaptyUI (3.15.1):
+    - Adapty (= 3.15.1)
+    - AdaptyLogger (= 3.15.1)
+    - AdaptyUIBuilder (= 3.15.1)
+  - AdaptyUIBuilder (3.15.1):
+    - AdaptyLogger (= 3.15.1)
   - boost (1.84.0)
   - DoubleConversion (1.1.6)
   - fast_float (8.0.0)
@@ -1663,10 +1663,10 @@ PODS:
     - React-RCTFBReactNativeSpec
     - ReactCommon/turbomodule/core
     - SocketRocket
-  - react-native-adapty-sdk (3.14.0):
-    - Adapty (= 3.14.1)
-    - AdaptyPlugin (= 3.14.1)
-    - AdaptyUI (= 3.14.1)
+  - react-native-adapty-sdk (3.15.0):
+    - Adapty (= 3.15.1)
+    - AdaptyPlugin (= 3.15.1)
+    - AdaptyUI (= 3.15.1)
     - React
   - react-native-safe-area-context (5.4.1):
     - boost
@@ -2538,11 +2538,11 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  Adapty: 49795e39a24caae30ac6842fe52fdb08622a5dde
-  AdaptyLogger: dacdb8a91f6a4ca30dc0b03f1b2b6fd33de742a9
-  AdaptyPlugin: 32b5242897a3959af18f9abae8b1b44a2fd27ba2
-  AdaptyUI: c3acd25bbe344853f3a6c7724acfb047e439b195
-  AdaptyUIBuilder: c74e253e65311a8853b2010fb65021d61c24f4ac
+  Adapty: bb2cc10a238b5d53025a0a969bc2a7ad6e9a48f5
+  AdaptyLogger: 2d1a3cc8b8dee29dc171df753d6b6d45332bd399
+  AdaptyPlugin: 79f4d39bcaa84ad3755fe0f0a07148abca2af4ed
+  AdaptyUI: 56ff8ed7be49cbff9cdc29ddde230de60e115d4f
+  AdaptyUIBuilder: 3204524ee377de2eddec478d51c3cf1f1e83ef1c
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   fast_float: b32c788ed9c6a8c584d114d0047beda9664e7cc6
@@ -2583,7 +2583,7 @@ SPEC CHECKSUMS:
   React-logger: b69e65dc60f768e5509ac0cc27a360124bf70478
   React-Mapbuffer: b48f9f3311fd0ec0f7a5dc39d707eff521fb5f38
   React-microtasksnativemodule: d8568d0485a350c720c061ae835e09fc88c28715
-  react-native-adapty-sdk: a2c859c9190f1a83547aac22c73e656d07338533
+  react-native-adapty-sdk: 39e2fb1607910e7d719e291281516864846792f1
   react-native-safe-area-context: 6775aa9089fa84b77abd7ebdcf45e224a2a2ad3e
   React-NativeModulesApple: f10596688a03af66804cfbe61792be24a7888da8
   React-oscompat: 7c0a341cc31e350da71ddf2e46de0a845d1d1626

ios/AdaptyOnboardingWrapperView.swift

@@ -43,9 +43,11 @@ class AdaptyOnboardingWrapperView: UIView {
         guard id != "NO_ID" else { return }
 
         Task { @MainActor in
-            guard let onboarding = await AdaptyPlugin.executeCreateNativeOnboardingView(withJson: json),
-                  let config = try? AdaptyUI.getOnboardingConfiguration(forOnboarding: onboarding)
-            else { return }
+            guard let config = try? await AdaptyPlugin.getOnboardingViewConfiguration(withJson: json)
+            else {
+                print("AdaptyOnboardingWrapperView: Failed to get onboarding configuration")
+                return
+            }
 
             let handler = SwiftAdaptyPluginEventHandler { event in
                 RNAdapty.emitPluginEvent(event)

package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "react-native-adapty",
-  "version": "3.14.2",
+  "version": "3.15.0",
   "description": "Adapty React Native SDK",
   "license": "MIT",
   "author": "Adapty team <support@adapty.io>",
@@ -21,7 +21,15 @@
   },
   "files": [
     "src/",
+    "!src/__tests__",
+    "!src/__docs__*",
+    "!**/*.test.ts",
+    "!**/*.test.tsx",
+    "!**/*.spec.ts",
+    "!**/*.spec.tsx",
     "dist/",
+    "!dist/__tests__",
+    "!dist/__docs__*",
     "ios/",
     "!ios/build",
     "!ios/RNAdapty.xcodeproj/project.xcworkspace",

react-native-adapty-sdk.podspec

@@ -19,9 +19,9 @@ Pod::Spec.new do |s|
   s.resources = "ios/**/*.{plist}"
   s.requires_arc = true
 
-  s.dependency "Adapty", "3.14.1"
-  s.dependency "AdaptyUI", "3.14.1"
-  s.dependency "AdaptyPlugin", "3.14.1"
+  s.dependency "Adapty", "3.15.1"
+  s.dependency "AdaptyUI", "3.15.1"
+  s.dependency "AdaptyPlugin", "3.15.1"
   s.dependency "React"
 end
 

src/__tests__/integration/adapty-handler/purchase-event.test.ts

@@ -0,0 +1,64 @@
+import { Adapty } from '@/adapty-handler';
+import type { AdaptyPaywallProduct, AdaptyProfile } from '@/types';
+import { createAdaptyInstance, cleanupAdapty } from './setup.utils';
+
+describe('Adapty - Purchase Event', () => {
+  let adapty: Adapty;
+
+  beforeEach(async () => {
+    adapty = await createAdaptyInstance();
+  });
+
+  afterEach(() => {
+    cleanupAdapty(adapty);
+  });
+
+  it('should emit onLatestProfileLoad event after purchase with correct format', async () => {
+    const product: AdaptyPaywallProduct = {
+      ios: { isFamilyShareable: false },
+      vendorProductId: 'com.example.test',
+      adaptyId: 'adapty_test',
+      paywallProductIndex: 0,
+      localizedDescription: 'Test Product',
+      localizedTitle: 'Test',
+      regionCode: 'US',
+      variationId: 'variation_test',
+      paywallABTestName: 'test_ab',
+      paywallName: 'Test Paywall',
+      accessLevelId: 'test_premium',
+      productType: 'subscription',
+      payloadData: 'test_payload',
+      price: {
+        amount: 9.99,
+        currencyCode: 'USD',
+        currencySymbol: '$',
+        localizedString: '$9.99',
+      },
+    };
+
+    const profileUpdates: AdaptyProfile[] = [];
+
+    const listener = adapty.addEventListener('onLatestProfileLoad', profile => {
+      profileUpdates.push(profile);
+
+      // Verify no circular references by serializing
+      expect(() => JSON.stringify(profile)).not.toThrow();
+    });
+
+    try {
+      const result = await adapty.makePurchase(product);
+      expect(result.type).toBe('success');
+
+      await new Promise(resolve => setTimeout(resolve, 100));
+
+      expect(profileUpdates).toHaveLength(1);
+      expect(profileUpdates[0]?.profileId).toBeDefined();
+      expect(profileUpdates[0]?.accessLevels?.['config_premium']).toBeDefined();
+      expect(
+        profileUpdates[0]?.accessLevels?.['config_premium']?.isActive,
+      ).toBe(true);
+    } finally {
+      listener.remove();
+    }
+  });
+});