Moved to a beta, added release for web2app branch

- Fixed tests too

Author: yusuftor

.github/workflows/tag-version.yml

@@ -2,7 +2,7 @@ name: TagVersion
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, feature/web2app ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -68,4 +68,3 @@ jobs:
       env:
         SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
         SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-  

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 The changelog for `SuperwallKit`. Also see the [releases](https://github.com/superwall/Superwall-iOS/releases) on GitHub.
 
-## 4.1.0
+## 4.1.0-beta.1
 
 ### Enhancements
 

Sources/SuperwallKit/Misc/Constants.swift

@@ -18,5 +18,5 @@ let sdkVersion = """
 */
 
 let sdkVersion = """
-4.1.0
+4.1.0-beta.1
 """

SuperwallKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 	s.name         = "SuperwallKit"
-  s.version      = "4.1.0"
+  s.version      = "4.1.0-beta.1"
 	s.summary      = "Superwall: In-App Paywalls Made Easy"
 	s.description  = "Paywall infrastructure for mobile apps :) we make things like editing your paywall and running price tests as easy as clicking a few buttons. superwall.com"
 

Tests/SuperwallKitTests/Storage/Cache/CacheMock.swift

@@ -17,13 +17,11 @@ final class CacheMock: Cache {
   init(
     cacheInternalValue: [String: Data] = [:],
     userDocumentsInternalValue: [String: Data] = [:],
-    appDocumentsInternalValue: [String: Data] = [:],
-    factory: ExternalPurchaseControllerFactory = DependencyContainer()
+    appDocumentsInternalValue: [String: Data] = [:]
   ) {
     self.internalCache = cacheInternalValue
     self.internalUserDocuments = userDocumentsInternalValue
     self.internalAppDocuments = appDocumentsInternalValue
-    super.init(factory: factory)
   }
 
   override func read<Key>(

Tests/SuperwallKitTests/Storage/Cache/CacheTests.swift

@@ -36,8 +36,7 @@ struct CacheTests {
     )
     cache = Cache(
       fileManager: fileManager,
-      ioQueue: DispatchQueue(label: "ioQueue"),
-      factory: DependencyContainer()
+      ioQueue: DispatchQueue(label: "ioQueue")
     )
   }
 
@@ -134,13 +133,9 @@ struct CacheTests {
     #expect(!fileManager.fileExists(atPath: appDocFolder.path))
   }
 
-  /// Test that cleanUserCodes correctly filters out non-device results and writes updated entitlements.
+  /// Test that cleanUserCodes correctly filters out non-device results and clears entitlements.
   @Test("Filters out non-device results")
   mutating func testCleanUserCodes_() async throws {
-    let mockPC = MockPurchaseController()
-    let mockFactory = MockExternalPurchaseControllerFactory(purchaseController: mockPC)
-    cache = Cache(factory: mockFactory)
-
     let entitlement1 = Entitlement(id: "a")
     let entitlement2 = Entitlement(id: "b")
     let entitlement3 = Entitlement(id: "c")
@@ -208,17 +203,12 @@ struct CacheTests {
 
     // Should only contain the deviceSuccess and expiredDevice
     #expect(updatedResponse.results.count == 2)
-    #expect(updatedResponse.entitlements == [entitlement1])
-    #expect(mockPC.didCallOffDeviceSubscriptionsDidChange == true)
+    #expect(updatedResponse.entitlements.isEmpty)
   }
 
   /// Test that cleanUserCodes correctly filters out non-device results and writes updated entitlements.
   @Test("Filters out non-device results")
   mutating func testEntitlementsAreSame() async throws {
-    let mockPC = MockPurchaseController()
-    let mockFactory = MockExternalPurchaseControllerFactory(purchaseController: mockPC)
-    cache = Cache(factory: mockFactory)
-
     let entitlement2 = Entitlement(id: "b")
     let entitlement3 = Entitlement(id: "c")
 
@@ -268,6 +258,5 @@ struct CacheTests {
     // Should only contain the deviceSuccess and expiredDevice
     #expect(updatedResponse.results.count == 1)
     #expect(updatedResponse.entitlements.isEmpty)
-    #expect(mockPC.didCallOffDeviceSubscriptionsDidChange == false)
   }
 }

Tests/SuperwallKitTests/Storage/StorageMock.swift

@@ -17,11 +17,7 @@ final class StorageMock: Storage {
   var didClearCachedSessionEvents = false
   var didSave = false
 
-  class DeviceInfoFactoryMock: DeviceHelperFactory, ExternalPurchaseControllerFactory {
-    func makeExternalPurchaseController() -> any SuperwallKit.PurchaseController {
-      DependencyContainer().purchaseController
-    }
-    
+  class DeviceInfoFactoryMock: DeviceHelperFactory, HasExternalPurchaseControllerFactory {
     func makeDeviceInfo() -> DeviceInfo {
       return DeviceInfo(appInstalledAtString: "a", locale: "b")
     }
@@ -44,13 +40,12 @@ final class StorageMock: Storage {
     internalSurveyAssignmentKey: String? = nil,
     coreDataManager: CoreDataManagerFakeDataMock = CoreDataManagerFakeDataMock(),
     confirmedAssignments: Set<Assignment>? = [],
-    cache: Cache? = nil
+    cache: Cache = Cache()
   ) {
     self.internalCachedTransactions = internalCachedTransactions
     self.internalConfirmedAssignments = confirmedAssignments
     self.internalSurveyAssignmentKey = internalSurveyAssignmentKey
-    let factory = DeviceInfoFactoryMock()
-    super.init(factory: DeviceInfoFactoryMock(), cache: cache ?? Cache(factory: factory), coreDataManager: coreDataManager)
+    super.init(factory: DeviceInfoFactoryMock(), cache: cache, coreDataManager: coreDataManager)
   }
 
   override func get<Key>(_ keyType: Key.Type) -> Key.Value? where Key : Storable {