Merge branch 'release/0.1.27'

tosspayments · Dec 19, 2023 · 69a842b · 69a842b
2 parents ab8d47a + 3f4d06c
commit 69a842b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/Examples/TossPayments.xcodeproj/project.pbxproj b/Examples/TossPayments.xcodeproj/project.pbxproj
@@ -1188,7 +1188,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.26;
+				MARKETING_VERSION = 0.1.27;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.tosspayments.paymentsdk.examples.uikit;
@@ -1226,7 +1226,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.26;
+				MARKETING_VERSION = 0.1.27;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.tosspayments.paymentsdk.examples.uikit;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/TossPayments/Sources/BrowserPopupWindow/BrowserPopupHandler.swift b/TossPayments/Sources/BrowserPopupWindow/BrowserPopupHandler.swift
@@ -24,7 +24,7 @@ extension BrowserPopupHandler {
         let popupWebView = WKWebView(frame: parentWebView.frame, configuration: configuration)
         popupWebView.navigationDelegate = parentWebView.navigationDelegate
         popupWebView.uiDelegate = parentWebView.uiDelegate
-#if DEBUG
+#if DEBUG && swift(>=5.8)
         if #available(iOS 16.4, *) {
             popupWebView.isInspectable = true
         }

diff --git a/TossPayments/Sources/BrowserPopupWindow/BrowserPopupWindowController.swift b/TossPayments/Sources/BrowserPopupWindow/BrowserPopupWindowController.swift
@@ -33,7 +33,7 @@ final class BrowserPopupWindowController: UIViewController {
         }
         // Re-assign UI delegate to this controler so that we can handle broswers window.close() event.
         popupWebView.uiDelegate = self
-#if DEBUG
+#if DEBUG && swift(>=5.8)
         if #available(iOS 16.4, *) {
             popupWebView.isInspectable = true
         }

diff --git a/TossPayments/Sources/UIKit/Base/TossPaymentsViewController.swift b/TossPayments/Sources/UIKit/Base/TossPaymentsViewController.swift
@@ -29,7 +29,7 @@ final class TossPaymentsViewController: UIViewController {
         super.init(nibName: nil, bundle: nil)
         webView.navigationDelegate = service
         webView.uiDelegate = self
-#if DEBUG
+#if DEBUG && swift(>=5.8)
         if #available(iOS 16.4, *) {
             webView.isInspectable = true
         }
@@ -48,7 +48,7 @@ final class TossPaymentsViewController: UIViewController {
         view.addSubview(webView)
         webView.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
-            webView.topAnchor.constraint(equalTo: view.topAnchor),
+            webView.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
             webView.bottomAnchor.constraint(equalTo: view.bottomAnchor),
             webView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
             webView.leadingAnchor.constraint(equalTo: view.leadingAnchor)

diff --git a/TossPayments/Sources/UIKit/BrandPay/BrandPay.swift b/TossPayments/Sources/UIKit/BrandPay/BrandPay.swift
@@ -8,7 +8,7 @@
 import UIKit
 
 extension PaymentWidget {
-    
+
     /// 결제위젯에 추가적으로 들어갈 수 있는 기능
     public struct Options: Encodable {
         public let brandpay: BrandPay?
@@ -25,21 +25,21 @@ extension PaymentWidget {
 
     /// 브랜드페이
     public struct BrandPay: Encodable {
-        
+
         /// 가맹점의 서버에서 구현해줘야하는 auth URL 주소
         public let redirectURL: String
         enum CodingKeys: String, CodingKey {
             case redirectURL = "redirectUrl"
         }
-        
+
         public init(redirectURL: String) {
             self.redirectURL = redirectURL
         }
     }
-    
+
     public struct Environment: Encodable {
         public let platform: String = "ios"
-        public let sdkVersion: String = "0.1.26"
+        public let sdkVersion: String = "0.1.27"
         public let osVersion: String = UIDevice.current.systemVersion
     }
 }
diff --git a/TossPayments/Sources/UIKit/Widget/Model/AgreementWidget.swift b/TossPayments/Sources/UIKit/Widget/Model/AgreementWidget.swift
@@ -23,7 +23,7 @@ public final class AgreementWidget: WKWebView, PaymentWidgetComponent {
     init() {
         super.init(frame: .zero, configuration: WKWebViewConfiguration())
         uiDelegate = self
-#if DEBUG
+#if DEBUG && swift(>=5.8)
         if #available(iOS 16.4, *) {
             isInspectable = true
         }

diff --git a/TossPayments/Sources/UIKit/Widget/Model/PaymentMethodWidget.swift b/TossPayments/Sources/UIKit/Widget/Model/PaymentMethodWidget.swift
@@ -24,7 +24,7 @@ public final class PaymentMethodWidget: WKWebView, PaymentWidgetComponent {
     init() {
         super.init(frame: .zero, configuration: WKWebViewConfiguration())
         uiDelegate = self
-#if DEBUG
+#if DEBUG && swift(>=5.8)
         if #available(iOS 16.4, *) {
             isInspectable = true
         }