Merge remote-tracking branch 'origin/release/3.17.0'

Author: x401om

Adapty.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Adapty'
-  s.version          = '3.15.7'
+  s.version          = '3.17.0'
   s.summary          = 'Adapty SDK for iOS.'
 
   s.description      = <<-DESC

AdaptyLogger.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'AdaptyLogger'
-  s.version          = '3.15.7'
+  s.version          = '3.17.0'
   s.summary          = 'Adapty Logger for iOS.'
 
   s.description    = <<-DESC

AdaptyPlugin.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'AdaptyPlugin'
-  s.version          = '3.15.7'
+  s.version          = '3.17.0'
   s.summary          = 'Common files for cross-platform SDKs Adapty'
 
   s.description      = <<-DESC

AdaptyUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'AdaptyUI'
-  s.version          = '3.15.7'
+  s.version          = '3.17.0'
   s.summary          = 'Adapty SDK for iOS.'
 
   s.description      = <<-DESC

AdaptyUIBuilder.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'AdaptyUIBuilder'
-  s.version          = '3.15.7'
+  s.version          = '3.17.0'
   s.summary      = 'Adapty UI Builder for iOS.'
 
   s.description    = <<-DESC

Sources.AdaptyPlugin/Codable.AdaptyUI/AdaptyUI.Action+Encodable.swift

@@ -13,6 +13,7 @@ extension AdaptyUI.Action: Encodable {
     private enum CodingKeys: String, CodingKey {
         case type
         case value
+        case openIn = "open_in"
     }
 
     public func encode(to encoder: Encoder) throws {
@@ -21,9 +22,10 @@ extension AdaptyUI.Action: Encodable {
         switch self {
         case .close:
             try container.encode("close", forKey: .type)
-        case .openURL(let url):
+        case .openURL(let url, let openIn):
             try container.encode("open_url", forKey: .type)
             try container.encode(url.absoluteString, forKey: .value)
+            try container.encode(openIn, forKey: .openIn)
         case .custom(let id):
             try container.encode("custom", forKey: .type)
             try container.encode(id, forKey: .value)

Sources.AdaptyPlugin/Codable/AdaptyWebPresentation+Codable.swift

@@ -7,7 +7,7 @@
 
 import Adapty
 
-extension AdaptyWebPresentation: Decodable {
+extension AdaptyWebPresentation: Codable {
     public init(from decoder: any Decoder) throws {
         let container = try decoder.singleValueContainer()
         let stringValue = try container.decode(String.self)
@@ -20,4 +20,14 @@ extension AdaptyWebPresentation: Decodable {
             self = .externalBrowser
         }
     }
+
+    public func encode(to encoder: any Encoder) throws {
+        var container = encoder.singleValueContainer()
+        switch self {
+        case .externalBrowser:
+            try container.encode("browser_out_app")
+        case .inAppBrowser:
+            try container.encode("browser_in_app")
+        }
+    }
 }

Sources.AdaptyPlugin/cross_platform.yaml

@@ -1,5 +1,5 @@
 $schema: "https://json-schema.org/draft/2020-12/schema"
-$id: "https://adapty.io/crossPlatform/3.15.7/schema"
+$id: "https://adapty.io/crossPlatform/3.17.0/schema"
 title: "Cross Platform Format"
 
 $requests:
@@ -1455,9 +1455,14 @@ $defs:
       - required: [type]
         properties:
           type: { type: string, const: ["close", "system_back"] }
+      - required: [type, value, open_in]
+        properties:
+          type: { type: string, const: "open_url" }
+          value: { type: string }
+          open_in: { $ref: "#/$defs/AdaptyWebPresentation" }
       - required: [type, value]
         properties:
-          type: { type: string, enum: ["open_url", "custom"] }
+          type: { type: string, const: "custom" }
           value: { type: string }
 
   AdaptyUI.CustomTagsValues: #request

Sources.AdaptyUI/AdaptyUI+DefaultConfiguration.swift

@@ -24,8 +24,8 @@ public extension AdaptyPaywallControllerDelegate {
         switch action {
         case .close:
             controller.dismiss(animated: true)
-        case let .openURL(url):
-            UIApplication.shared.open(url, options: [:])
+        case let .openURL(url, openIn):
+            url.open(in: openIn.toBuilderWebPresentation)
         case .custom:
             break
         }

Sources.AdaptyUI/AdaptyUI+Public.swift

@@ -36,7 +36,7 @@ public extension AdaptyUI {
         /// User pressed Close Button
         case close
         /// User pressed any button with URL
-        case openURL(url: URL)
+        case openURL(url: URL, in: AdaptyWebPresentation)
         /// User pressed any button with custom action (e.g. login)
         case custom(id: String)
     }