From c6372b98a41da1a4a37f3a2a9c530e4c1b76ec28 Mon Sep 17 00:00:00 2001 From: Brian Anglin Date: Mon, 12 May 2025 14:34:55 -0700 Subject: [PATCH 1/3] WIP Adds storekit option --- ios/Json/SuperwallOptions+Json.swift | 6 +++++- src/public/SuperwallOptions.ts | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ios/Json/SuperwallOptions+Json.swift b/ios/Json/SuperwallOptions+Json.swift index 787f03c..68a471a 100644 --- a/ios/Json/SuperwallOptions+Json.swift +++ b/ios/Json/SuperwallOptions+Json.swift @@ -9,7 +9,8 @@ extension SuperwallOptions { let networkEnvironment = NetworkEnvironment.fromJson(networkEnvironmentValue), let isExternalDataCollectionEnabled = dictionary["isExternalDataCollectionEnabled"] as? Bool, let loggingValue = dictionary["logging"] as? [String: Any], - let logging = Logging.fromJson(loggingValue) + let logging = Logging.fromJson(loggingValue), + let storeKitVersion = dictionary["storeKitVersion"] as? String else { return nil } @@ -24,6 +25,9 @@ extension SuperwallOptions { superwallOptions.localeIdentifier = localeIdentifier superwallOptions.isGameControllerEnabled = isGameControllerEnabled superwallOptions.logging = logging + if let storeKitVersion = storeKitVersion { + superwallOptions.storeKitVersion = storeKitVersion == "STOREKIT1" ? .storeKit1 : .storeKit2 + } return superwallOptions } diff --git a/src/public/SuperwallOptions.ts b/src/public/SuperwallOptions.ts index 72ee4f9..0c2dccb 100644 --- a/src/public/SuperwallOptions.ts +++ b/src/public/SuperwallOptions.ts @@ -29,6 +29,7 @@ export class SuperwallOptions { logging: LoggingOptions = new LoggingOptions(); collectAdServicesAttribution: boolean = false; passIdentifiersToPlayStore: boolean = false; + storeKitVersion?: "STOREKIT1" | "STOREKIT2"; constructor(init?: Partial) { if (init) { @@ -52,6 +53,7 @@ export class SuperwallOptions { logging: this.logging.toJson(), collectAdServicesAttribution: this.collectAdServicesAttribution, passIdentifiersToPlayStore: this.passIdentifiersToPlayStore, + storeKitVersion: this.storeKitVersion, }; } } From ecb70fa259034efe62448dc9371df1b1139eca4b Mon Sep 17 00:00:00 2001 From: Duncan Crawbuck Date: Mon, 12 May 2025 14:57:03 -0700 Subject: [PATCH 2/3] fix(json): don't require storeKitVersion set --- ios/Json/SuperwallOptions+Json.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Json/SuperwallOptions+Json.swift b/ios/Json/SuperwallOptions+Json.swift index 68a471a..af98f92 100644 --- a/ios/Json/SuperwallOptions+Json.swift +++ b/ios/Json/SuperwallOptions+Json.swift @@ -9,14 +9,14 @@ extension SuperwallOptions { let networkEnvironment = NetworkEnvironment.fromJson(networkEnvironmentValue), let isExternalDataCollectionEnabled = dictionary["isExternalDataCollectionEnabled"] as? Bool, let loggingValue = dictionary["logging"] as? [String: Any], - let logging = Logging.fromJson(loggingValue), - let storeKitVersion = dictionary["storeKitVersion"] as? String + let logging = Logging.fromJson(loggingValue) else { return nil } let localeIdentifier = dictionary["localeIdentifier"] as? String let isGameControllerEnabled = dictionary["isGameControllerEnabled"] as? Bool ?? false + let storeKitVersion = dictionary["storeKitVersion"] as? String let superwallOptions = SuperwallOptions() superwallOptions.paywalls = paywalls From 91a0315f690fceeaa081c9a382818a20fefb0819 Mon Sep 17 00:00:00 2001 From: Duncan Crawbuck Date: Mon, 12 May 2025 14:59:32 -0700 Subject: [PATCH 3/3] version bump --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fedbed1..cd0bf33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ The changelog for `Superwall`. Also see the [releases](https://github.com/superwall/react-native-superwall/releases) on GitHub. +## 2.1.0 (Beta 3) + +### Fixes + +- Adds support for `storeKitVersion` in `SuperwallOptions`. + ## 2.1.0 (Beta 2) ### Fixes diff --git a/package.json b/package.json index 0223e95..dc50be0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@superwall/react-native-superwall", - "version": "2.1.0-beta.2", + "version": "2.1.0-beta.3", "description": "The React Native package for Superwall", "main": "lib/commonjs/index", "module": "lib/module/index",