Merge pull request #198 from superwall-me/develop

3.5.0-rc.2

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 The changelog for `SuperwallKit`. Also see the [releases](https://github.com/superwall-me/Superwall-iOS/releases) on GitHub.
 
+## 3.5.0-rc.2
+
+### Fixes
+
+- Moves resources into their own resources bundle when installing via CocoaPods.
+
 ## 3.5.0-rc.1
 
 This is our first visionOS pre-release, we'll test this on a few devices to

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Nest22
+Copyright (c) 2024 Nest22
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Sources/SuperwallKit/Misc/Constants.swift

@@ -18,5 +18,5 @@ let sdkVersion = """
 */
 
 let sdkVersion = """
-3.5.0-rc.1
+3.5.0-rc.2
 """

Sources/SuperwallKit/Models/Triggers/Trigger.swift

@@ -10,14 +10,6 @@ import Foundation
 struct Trigger: Decodable, Hashable {
   var eventName: String
   var rules: [TriggerRule]
-
-  init(
-    eventName: String,
-    rules: [TriggerRule]
-  ) {
-    self.eventName = eventName
-    self.rules = rules
-  }
 }
 
 extension Trigger: Stubbable {

Sources/SuperwallKit/Network/Device Helper/DeviceHelper.swift

@@ -121,21 +121,21 @@ class DeviceHelper {
   }
 
   var interfaceStyle: String {
-      #if os(visionOS)
+    #if os(visionOS)
+    return "Unknown"
+    #else
+    let style = UIScreen.main.traitCollection.userInterfaceStyle
+    switch style {
+    case .unspecified:
+      return "Unspecified"
+    case .light:
+      return "Light"
+    case .dark:
+      return "Dark"
+    default:
       return "Unknown"
-      #else
-      let style = UIScreen.main.traitCollection.userInterfaceStyle
-      switch style {
-      case .unspecified:
-        return "Unspecified"
-      case .light:
-        return "Light"
-      case .dark:
-        return "Dark"
-      default:
-        return "Unknown"
-      }
-      #endif
+    }
+    #endif
 	}
 
   var platformWrapper: String?

Sources/SuperwallKit/Paywall/View Controller/PaywallViewController.swift

@@ -306,7 +306,7 @@ public class PaywallViewController: UIViewController, LoadingDelegate {
     }
   }
 
-	func loadingStateDidChange(from oldValue: PaywallLoadingState) {
+  func loadingStateDidChange(from oldValue: PaywallLoadingState) {
     switch loadingState {
     case .unknown:
       break
@@ -341,9 +341,9 @@ public class PaywallViewController: UIViewController, LoadingDelegate {
             self.shimmerView = nil
           }
         )
-			}
-		}
-	}
+      }
+    }
+  }
 
   private func addShimmerView(onPresent: Bool = false) {
     guard shimmerView == nil else {

SuperwallKit.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
 	s.license      =  { :type => 'MIT', :text => <<-LICENSE
 		MIT License
 
-		Copyright (c) 2023 Superwall
+		Copyright (c) 2024 Superwall
 
 		Permission is hereby granted, free of charge, to any person obtaining a copy
 		of this software and associated documentation files (the "Software"), to deal
@@ -39,10 +39,12 @@ Pod::Spec.new do |s|
 	s.requires_arc = true
 
   s.source_files  = "Sources/**/*.{swift}"
-  s.resources = [
-    "Sources/SuperwallKit/**/*.xcassets",
-    "Sources/SuperwallKit/**/*.xcdatamodeld",
-    "Sources/SuperwallKit/**/*.cer"
-  ]
+  s.resource_bundles = {
+    'SuperwallKit' => [
+      "Sources/SuperwallKit/**/*.xcassets",
+      "Sources/SuperwallKit/**/*.xcdatamodeld",
+      "Sources/SuperwallKit/**/*.cer"
+    ]
+  }
 
 end