Merge pull request #392 from qonversion/release/10.0.0

suriksarkisyan · web-flow · commit 08dc9ddf4cb6 · 2025-11-21T16:35:13.000+03:00
Release 10.0.0
diff --git a/android/build.gradle b/android/build.gradle
@@ -80,7 +80,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "io.qonversion:sandwich:6.0.11"
+  implementation "io.qonversion:sandwich:7.1.0"
 }
 
 if (isNewArchitectureEnabled()) {
diff --git a/android/src/main/java/com/qonversion/reactnativesdk/NoCodesModule.kt b/android/src/main/java/com/qonversion/reactnativesdk/NoCodesModule.kt
@@ -32,9 +32,9 @@ class NoCodesModule(private val reactContext: ReactApplicationContext) : NativeN
     }
 
     @ReactMethod
-    override fun initialize(projectKey: String, source: String, version: String) {
+    override fun initialize(projectKey: String, source: String, version: String, proxyUrl: String?) {
         noCodesSandwich.storeSdkInfo(reactContext, source, version)
-        noCodesSandwich.initialize(reactContext, projectKey, null, null, null)
+        noCodesSandwich.initialize(reactContext, projectKey, null, null, proxyUrl)
         noCodesSandwich.setDelegate(noCodesEventListener)
         noCodesSandwich.setScreenCustomizationDelegate()
     }
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -5,16 +5,16 @@ buildscript {
         compileSdkVersion = 35
         targetSdkVersion = 35
         ndkVersion = "27.1.12297006"
-        kotlinVersion = "2.0.21"
+        kotlinVersion = "2.1.20"
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle")
+        classpath("com.android.tools.build:gradle:8.9.2")
         classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }
 
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -8,18 +8,16 @@ PODS:
   - hermes-engine (0.80.1):
     - hermes-engine/Pre-built (= 0.80.1)
   - hermes-engine/Pre-built (0.80.1)
-  - NoCodes (0.1.3):
-    - Qonversion (= 5.13.3)
-  - Qonversion (5.13.3):
-    - Qonversion/Main (= 5.13.3)
-  - qonversion-react-native-sdk (9.0.2):
+  - Qonversion (6.0.0):
+    - Qonversion/Main (= 6.0.0)
+  - qonversion-react-native-sdk (10.0.0):
     - boost
     - DoubleConversion
     - fast_float
     - fmt
     - glog
     - hermes-engine
-    - QonversionSandwich (= 6.0.10)
+    - QonversionSandwich (= 7.0.0)
     - RCT-Folly
     - RCT-Folly/Fabric
     - RCTRequired
@@ -42,10 +40,9 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
-  - Qonversion/Main (5.13.3)
-  - QonversionSandwich (6.0.10):
-    - NoCodes (= 0.1.3)
-    - Qonversion (= 5.13.3)
+  - Qonversion/Main (6.0.0)
+  - QonversionSandwich (7.0.0):
+    - Qonversion (= 6.0.0)
   - RCT-Folly (2024.11.18.00):
     - boost
     - DoubleConversion
@@ -2275,7 +2272,6 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - NoCodes
     - Qonversion
     - QonversionSandwich
     - SocketRocket
@@ -2441,11 +2437,10 @@ SPEC CHECKSUMS:
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
   hermes-engine: 4f07404533b808de66cf48ac4200463068d0e95a
-  NoCodes: 21b87d320a16758c6eb79167ff98010d81b4894e
-  Qonversion: 2b32ae8681de3ba02db5b5ed69c8f213ac4a28fa
-  qonversion-react-native-sdk: 908023a6c5440ddc45b861a8b1547140c031d3a6
-  QonversionSandwich: 6a8c8704a57bc97393ec1684c8932402aa0b7ba9
-  RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f
+  Qonversion: 694b88c4bfc06d827c189908e73ea955a1ddde6c
+  qonversion-react-native-sdk: 262513c36e2c4ebd3718ff31af1c2cde4e52eb81
+  QonversionSandwich: 1795bd19b40c129e76e976d2e5b88d7a7c9174ef
+  RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
   RCTDeprecation: efa5010912100e944a7ac9a93a157e1def1988fe
   RCTRequired: bbc4cf999ddc4a4b076e076c74dd1d39d0254630
   RCTTypeSafety: d877728097547d0a37786cc9130c43ad71739ac3
@@ -2512,8 +2507,8 @@ SPEC CHECKSUMS:
   RNCClipboard: b228d492733d66e0126e18ce66c6d2f90bacc7e5
   RNSnackbar: c1b235eb606b03938c693ce769ed3059c31dff9b
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
-  Yoga: 703055a9f39562521cdb8657162dfd80f8c174c3
+  Yoga: daa1e4de4b971b977b23bc842aaa3e135324f1f3
 
 PODFILE CHECKSUM: 05782888d88e3a4a4bbc945c42df54704269e6ea
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
diff --git a/example/ios/QonversionExample.xcodeproj/project.pbxproj b/example/ios/QonversionExample.xcodeproj/project.pbxproj
@@ -195,14 +195,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-QonversionExample/Pods-QonversionExample-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-QonversionExample/Pods-QonversionExample-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QonversionExample/Pods-QonversionExample-frameworks.sh\"\n";
@@ -238,14 +234,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-QonversionExample/Pods-QonversionExample-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-QonversionExample/Pods-QonversionExample-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QonversionExample/Pods-QonversionExample-resources.sh\"\n";
@@ -392,7 +384,10 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -461,7 +456,10 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
diff --git a/ios/RNNoCodes.mm b/ios/RNNoCodes.mm
@@ -20,8 +20,9 @@ - (instancetype)init {
 
 - (void)initialize:(NSString *)projectKey
             source:(NSString *)source
-           version:(NSString *)version {
-    [self.impl initializeWithProjectKey:projectKey source:source version:version];
+           version:(NSString *)version
+          proxyUrl:(NSString *)proxyUrl {
+    [self.impl initializeWithProjectKey:projectKey source:source version:version proxyUrl:proxyUrl];
 }
 
 - (void)setScreenPresentationConfig:(NSDictionary *)configData
diff --git a/ios/RNNoCodesImpl.swift b/ios/RNNoCodesImpl.swift
@@ -42,9 +42,9 @@ public class RNNoCodesImpl: NSObject {
     }
 
     @objc
-    public func initialize(projectKey: String, source: String, version: String) {
+    public func initialize(projectKey: String, source: String, version: String, proxyUrl: String?) {
         // Ignore source and version, because it's taken from the Qonversion SDK.
-        noCodesSandwich?.initialize(projectKey: projectKey)
+        noCodesSandwich?.initialize(projectKey: projectKey, proxyUrl: proxyUrl)
     }
 
     @MainActor @objc
diff --git a/ios/RNQonversion.mm b/ios/RNQonversion.mm
@@ -91,7 +91,7 @@ - (void)userInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)r
     [self.impl userInfo:resolve reject:reject];
 }
 
-- (void)remoteConfig:(NSString *)contextKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+- (void)remoteConfig:(NSString * _Nullable)contextKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
     [self.impl remoteConfig:contextKey resolve:resolve reject:reject];
 }
 
diff --git a/ios/RNQonversionImpl.swift b/ios/RNQonversionImpl.swift
@@ -157,7 +157,7 @@ public class RNQonversionImpl: NSObject {
   }
 
   @objc
-  public func remoteConfig(_ contextKey: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+  public func remoteConfig(_ contextKey: String?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     qonversionSandwich?.remoteConfig(contextKey) { result, error in
       self.handleResult(result: result, error: error, resolve: resolve, reject: reject)
     }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@qonversion/react-native-sdk",
   "title": "React Native Qonversion",
-  "version": "10.0.0-RC2",
+  "version": "10.0.0",
   "description": "Qonversion provides full in-app purchases infrastructure, so you do not need to build your own server for receipt validation. Implement in-app subscriptions, validate user receipts, check subscription status, and provide access to your app features and content using our StoreKit wrapper and Google Play Billing wrapper.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
diff --git a/qonversion-react-native-sdk.podspec b/qonversion-react-native-sdk.podspec
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files = "ios/**/*.h"
 
-  s.dependency "QonversionSandwich", "6.0.10"
+  s.dependency "QonversionSandwich", "7.1.0"
   install_modules_dependencies(s)
 end
diff --git a/src/NoCodesConfig.ts b/src/NoCodesConfig.ts
@@ -3,13 +3,16 @@ import type { NoCodesListener } from './dto/NoCodesListener';
 class NoCodesConfig {
   readonly projectKey: string;
   readonly noCodesListener: NoCodesListener | undefined;
+  readonly proxyUrl: string | undefined;
 
   constructor(
     projectKey: string,
-    noCodesListener: NoCodesListener | undefined = undefined
+    noCodesListener: NoCodesListener | undefined = undefined,
+    proxyUrl: string | undefined = undefined
   ) {
     this.projectKey = projectKey;
     this.noCodesListener = noCodesListener;
+    this.proxyUrl = proxyUrl;
   }
 }
 
diff --git a/src/NoCodesConfigBuilder.ts b/src/NoCodesConfigBuilder.ts
@@ -4,6 +4,7 @@ import NoCodesConfig from './NoCodesConfig';
 class NoCodesConfigBuilder {
   private readonly projectKey: string;
   private noCodesListener: NoCodesListener | undefined = undefined;
+  private proxyUrl: string | undefined = undefined;
 
   constructor(projectKey: string) {
     this.projectKey = projectKey;
@@ -24,6 +25,17 @@ class NoCodesConfigBuilder {
     return this;
   }
 
+  /**
+   * Set proxy URL for NoCodes SDK.
+   *
+   * @param proxyUrl proxy URL to use for API requests.
+   * @return builder instance for chain calls.
+   */
+  setProxyURL(proxyUrl: string): NoCodesConfigBuilder {
+    this.proxyUrl = proxyUrl;
+    return this;
+  }
+
   /**
    * Generate {@link NoCodesConfig} instance with all the provided configurations.
    *
@@ -32,7 +44,8 @@ class NoCodesConfigBuilder {
   build(): NoCodesConfig {
     return new NoCodesConfig(
       this.projectKey,
-      this.noCodesListener
+      this.noCodesListener,
+      this.proxyUrl
     );
   }
 }
diff --git a/src/dto/Product.ts b/src/dto/Product.ts
@@ -1,6 +1,5 @@
 import {ProductType, PurchaseUpdatePolicy} from "./enums";
 import SKProduct from "./storeProducts/SKProduct";
-import SkuDetails from "./storeProducts/SkuDetails";
 import ProductStoreDetails from "./storeProducts/ProductStoreDetails";
 import ProductOfferDetails from './storeProducts/ProductOfferDetails';
 import PurchaseModel from './PurchaseModel';
@@ -16,14 +15,6 @@ class Product {
    */
   basePlanId: string | null;
 
-  /**
-   * Google Play Store details of this product.
-   * Android only. Null for iOS, or if the product was not found.
-   * Doesn't take into account {@link basePlanId}.
-   * @deprecated Consider using {@link storeDetails} instead.
-   */
-  skuDetails: SkuDetails | null;
-
   /**
    * Google Play Store details of this product.
    * Android only. Null for iOS, or if the product was not found.
@@ -39,8 +30,7 @@ class Product {
   offeringId?: string | null;
 
   /**
-   * For Android - the subscription base plan duration. If the {@link basePlanId} is not specified,
-   * the duration is calculated using the deprecated {@link skuDetails}.
+   * For Android - the subscription base plan duration from {@link storeDetails}.
    * For iOS - the duration of the {@link skProduct}.
    * Null, if it's not a subscription product or the product was not found in the store.
    */
@@ -56,8 +46,7 @@ class Product {
 
   /**
    * The calculated type of this product based on the store information.
-   * On Android uses deprecated {@link skuDetails} for the old subscription products
-   * where {@link basePlanId} is not specified, and {@link storeDetails} for all the other products.
+   * On Android uses {@link storeDetails} for all products.
    * On iOS uses {@link skProduct} information.
    */
   type: ProductType;
@@ -77,7 +66,6 @@ class Product {
     qonversionId: string,
     storeId: string,
     basePlanId: string | null,
-    skuDetails: SkuDetails | null,
     storeDetails: ProductStoreDetails | null,
     skProduct: SKProduct | null,
     offeringId: string | null,
@@ -94,7 +82,6 @@ class Product {
     this.qonversionId = qonversionId;
     this.storeId = storeId;
     this.basePlanId = basePlanId;
-    this.skuDetails = skuDetails;
     this.storeDetails = storeDetails;
     this.skProduct = skProduct;
     this.offeringId = offeringId;
diff --git a/src/dto/enums.ts b/src/dto/enums.ts
@@ -345,6 +345,7 @@ export enum QonversionErrorCode {
   LAUNCH_ERROR = "LaunchError", // There was an error while launching Qonversion SDK
   NETWORK_CONNECTION_FAILED = "NetworkConnectionFailed", // There was a network issue. Make sure that the Internet connection is available on the device
   OFFERINGS_NOT_FOUND = "OfferingsNotFound", // No offerings found
+  OFFERINGS_NOT_AVAILABLE = "OfferingsNotAvailable",
   PAYMENT_INVALID = "PaymentInvalid", // Purchase identifier was invalid, etc.
   PAYMENT_NOT_ALLOWED = "PaymentNotAllowed", // This device is not allowed to make the payment
   PLAY_STORE_ERROR = "PlayStoreError", // There was an issue with the Play Store service
diff --git a/src/dto/storeProducts/SkuDetails.ts b/src/dto/storeProducts/SkuDetails.ts
diff --git a/src/index.ts b/src/index.ts
diff --git a/src/internal/Mapper.ts b/src/internal/Mapper.ts
diff --git a/src/internal/NoCodesInternal.ts b/src/internal/NoCodesInternal.ts
diff --git a/src/internal/specs/NativeNoCodesModule.ts b/src/internal/specs/NativeNoCodesModule.ts

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")`
`80`	`80`	`dependencies {`
`81`	`81`	`implementation "com.facebook.react:react-android"`
`82`	`82`	`implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"`
`83`		`- implementation "io.qonversion:sandwich:6.0.11"`
	`83`	`+ implementation "io.qonversion:sandwich:7.1.0"`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if (isNewArchitectureEnabled()) {`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ class NoCodesModule(private val reactContext: ReactApplicationContext) : NativeN`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@ReactMethod`
`35`		`- override fun initialize(projectKey: String, source: String, version: String) {`
	`35`	`+ override fun initialize(projectKey: String, source: String, version: String, proxyUrl: String?) {`
`36`	`36`	`noCodesSandwich.storeSdkInfo(reactContext, source, version)`
`37`		`- noCodesSandwich.initialize(reactContext, projectKey, null, null, null)`
	`37`	`+ noCodesSandwich.initialize(reactContext, projectKey, null, null, proxyUrl)`
`38`	`38`	`noCodesSandwich.setDelegate(noCodesEventListener)`
`39`	`39`	`noCodesSandwich.setScreenCustomizationDelegate()`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,16 +5,16 @@ buildscript {`
`5`	`5`	`compileSdkVersion = 35`
`6`	`6`	`targetSdkVersion = 35`
`7`	`7`	`ndkVersion = "27.1.12297006"`
`8`		`- kotlinVersion = "2.0.21"`
	`8`	`+ kotlinVersion = "2.1.20"`
`9`	`9`	`}`
`10`	`10`	`repositories {`
`11`	`11`	`google()`
`12`	`12`	`mavenCentral()`
`13`	`13`	`}`
`14`	`14`	`dependencies {`
`15`		`- classpath("com.android.tools.build:gradle")`
	`15`	`+ classpath("com.android.tools.build:gradle:8.9.2")`
`16`	`16`	`classpath("com.facebook.react:react-native-gradle-plugin")`
`17`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")`
	`17`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ public class RNNoCodesImpl: NSObject {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@objc`
`45`		`- public func initialize(projectKey: String, source: String, version: String) {`
	`45`	`+ public func initialize(projectKey: String, source: String, version: String, proxyUrl: String?) {`
`46`	`46`	`// Ignore source and version, because it's taken from the Qonversion SDK.`
`47`		`- noCodesSandwich?.initialize(projectKey: projectKey)`
	`47`	`+ noCodesSandwich?.initialize(projectKey: projectKey, proxyUrl: proxyUrl)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@MainActor @objc`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ - (void)userInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)r`
`91`	`91`	`[self.impl userInfo:resolve reject:reject];`
`92`	`92`	`}`
`93`	`93`
`94`		`-- (void)remoteConfig:(NSString *)contextKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {`
	`94`	`+- (void)remoteConfig:(NSString * _Nullable)contextKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {`
`95`	`95`	`[self.impl remoteConfig:contextKey resolve:resolve reject:reject];`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public class RNQonversionImpl: NSObject {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`@objc`
`160`		`- public func remoteConfig(_ contextKey: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {`
	`160`	`+ public func remoteConfig(_ contextKey: String?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {`
`161`	`161`	`qonversionSandwich?.remoteConfig(contextKey) { result, error in`
`162`	`162`	`self.handleResult(result: result, error: error, resolve: resolve, reject: reject)`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@qonversion/react-native-sdk",`
`3`	`3`	`"title": "React Native Qonversion",`
`4`		`- "version": "10.0.0-RC2",`
	`4`	`+ "version": "10.0.0",`
`5`	`5`	`"description": "Qonversion provides full in-app purchases infrastructure, so you do not need to build your own server for receipt validation. Implement in-app subscriptions, validate user receipts, check subscription status, and provide access to your app features and content using our StoreKit wrapper and Google Play Billing wrapper.",`
`6`	`6`	`"main": "./lib/module/index.js",`
`7`	`7`	`"types": "./lib/typescript/src/index.d.ts",`