Restore braze dependency (#985)

fix(dependencies): restore braze package dependency after they fixed a bug with Xcode 15.3
Pocket · Apr 2, 2024 · 3285d8b · 3285d8b
1 parent 985ece8
commit 3285d8b
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 26 deletions.
diff --git a/Pocket.xcodeproj/project.pbxproj b/Pocket.xcodeproj/project.pbxproj
@@ -95,11 +95,11 @@
 		AA2E890C2A0D8849004A27BD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AA2E890B2A0D8849004A27BD /* Assets.xcassets */; };
 		AA2E89102A0D8849004A27BD /* ItemWidgets.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = AA2E89012A0D8847004A27BD /* ItemWidgets.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		AA69A28429B7FC6E00BBA644 /* SearchGetPremiumEmptyViewElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA69A28329B7FC6E00BBA644 /* SearchGetPremiumEmptyViewElement.swift */; };
-		AA7A8ABF2B9A67AC0035E0F7 /* BrazePushStory in Frameworks */ = {isa = PBXBuildFile; productRef = AA7A8ABE2B9A67AC0035E0F7 /* BrazePushStory */; };
-		AA7A8AC12B9A67CA0035E0F7 /* BrazeNotificationService in Frameworks */ = {isa = PBXBuildFile; productRef = AA7A8AC02B9A67CA0035E0F7 /* BrazeNotificationService */; };
 		AA7D6A2B2995F0A20094FD18 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA7D6A2A2995F0A20094FD18 /* StoreKit.framework */; };
 		AA9DB97429B6E6480046AEF6 /* Test_Subscriptions.storekit in Resources */ = {isa = PBXBuildFile; fileRef = AA909ACC299F4D5400F90FA7 /* Test_Subscriptions.storekit */; };
 		AAA3EF842A3A3976000117BE /* ItemWidgetsKit in Frameworks */ = {isa = PBXBuildFile; productRef = AAA3EF832A3A3976000117BE /* ItemWidgetsKit */; };
+		AAB4F3A62BBCA6140047A003 /* BrazeNotificationService in Frameworks */ = {isa = PBXBuildFile; productRef = AAB4F3A52BBCA6140047A003 /* BrazeNotificationService */; };
+		AAB4F3A82BBCA6140047A003 /* BrazePushStory in Frameworks */ = {isa = PBXBuildFile; productRef = AAB4F3A72BBCA6140047A003 /* BrazePushStory */; };
 		AAE6AC392A13504400790E33 /* RecentSavesWidgetPreviewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE6AC382A13504400790E33 /* RecentSavesWidgetPreviewer.swift */; };
 		AAEE908229B69BA70028587D /* PremiumTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAEE908129B69BA70028587D /* PremiumTests.swift */; };
 		AAEE908429B69E9F0028587D /* PremiumUpgradeViewElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAEE908329B69E9F0028587D /* PremiumUpgradeViewElement.swift */; };
@@ -349,7 +349,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AA7A8AC12B9A67CA0035E0F7 /* BrazeNotificationService in Frameworks */,
+				AAB4F3A62BBCA6140047A003 /* BrazeNotificationService in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -367,7 +367,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				65EC272928BA8AD50075E1DF /* UserNotificationsUI.framework in Frameworks */,
-				AA7A8ABF2B9A67AC0035E0F7 /* BrazePushStory in Frameworks */,
+				AAB4F3A82BBCA6140047A003 /* BrazePushStory in Frameworks */,
 				65EC272728BA8AD50075E1DF /* UserNotifications.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -705,7 +705,7 @@
 			);
 			name = PushNotificationServiceExtension;
 			packageProductDependencies = (
-				AA7A8AC02B9A67CA0035E0F7 /* BrazeNotificationService */,
+				AAB4F3A52BBCA6140047A003 /* BrazeNotificationService */,
 			);
 			productName = PushNotificationServiceExtension;
 			productReference = 650FECCB28BA85F300A3CB0C /* PushNotificationServiceExtension.appex */;
@@ -745,7 +745,7 @@
 			);
 			name = PushNotificationStoryExtension;
 			packageProductDependencies = (
-				AA7A8ABE2B9A67AC0035E0F7 /* BrazePushStory */,
+				AAB4F3A72BBCA6140047A003 /* BrazePushStory */,
 			);
 			productName = PushNotificationStoryExtension;
 			productReference = 65EC272528BA8AD50075E1DF /* PushNotificationStoryExtension.appex */;
@@ -856,7 +856,7 @@
 				3859089D29D35B2F00C8C17F /* XCRemoteSwiftPackageReference "ios_sdk" */,
 				6547A0FD29F17AAF00F6FC6B /* XCRemoteSwiftPackageReference "Sails" */,
 				650EEABA29F35499004D66BD /* XCRemoteSwiftPackageReference "apollo-ios" */,
-				AA1A2E582B9A639C0091C849 /* XCRemoteSwiftPackageReference "braze-swift-sdk-prebuilt-dynamic" */,
+				AAB4F3A42BBCA6140047A003 /* XCRemoteSwiftPackageReference "braze-swift-sdk" */,
 			);
 			productRefGroup = 166A81B12637406C0015AA1D /* Products */;
 			projectDirPath = "";
@@ -2132,12 +2132,12 @@
 				kind = branch;
 			};
 		};
-		AA1A2E582B9A639C0091C849 /* XCRemoteSwiftPackageReference "braze-swift-sdk-prebuilt-dynamic" */ = {
+		AAB4F3A42BBCA6140047A003 /* XCRemoteSwiftPackageReference "braze-swift-sdk" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/braze-inc/braze-swift-sdk-prebuilt-dynamic";
+			repositoryURL = "https://github.com/braze-inc/braze-swift-sdk.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 8.1.0;
+				minimumVersion = 8.2.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
@@ -2194,19 +2194,19 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = PocketKit;
 		};
-		AA7A8ABE2B9A67AC0035E0F7 /* BrazePushStory */ = {
+		AAA3EF832A3A3976000117BE /* ItemWidgetsKit */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = AA1A2E582B9A639C0091C849 /* XCRemoteSwiftPackageReference "braze-swift-sdk-prebuilt-dynamic" */;
-			productName = BrazePushStory;
+			productName = ItemWidgetsKit;
 		};
-		AA7A8AC02B9A67CA0035E0F7 /* BrazeNotificationService */ = {
+		AAB4F3A52BBCA6140047A003 /* BrazeNotificationService */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = AA1A2E582B9A639C0091C849 /* XCRemoteSwiftPackageReference "braze-swift-sdk-prebuilt-dynamic" */;
+			package = AAB4F3A42BBCA6140047A003 /* XCRemoteSwiftPackageReference "braze-swift-sdk" */;
 			productName = BrazeNotificationService;
 		};
-		AAA3EF832A3A3976000117BE /* ItemWidgetsKit */ = {
+		AAB4F3A72BBCA6140047A003 /* BrazePushStory */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = ItemWidgetsKit;
+			package = AAB4F3A42BBCA6140047A003 /* XCRemoteSwiftPackageReference "braze-swift-sdk" */;
+			productName = BrazePushStory;
 		};
 		F2687E7227E28F0F00E43F09 /* SaveToPocketKit */ = {
 			isa = XCSwiftPackageProductDependency;

diff --git a/Pocket.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Pocket.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -10,11 +10,11 @@
       }
     },
     {
-      "identity" : "braze-swift-sdk-prebuilt-dynamic",
+      "identity" : "braze-swift-sdk",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/braze-inc/braze-swift-sdk-prebuilt-dynamic",
+      "location" : "https://github.com/braze-inc/braze-swift-sdk.git",
       "state" : {
-        "revision" : "fb37aca4a34ae66adcf6456eaf06f6a574be78df",
+        "revision" : "e42292d5b782eabb9a8a40d839f04df6a62bebc7",
         "version" : "8.2.1"
       }
     },
@@ -81,6 +81,15 @@
         "revision" : "730166aa43b900e71a128e74910b1d9a431b24cf"
       }
     },
+    {
+      "identity" : "sdwebimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImage.git",
+      "state" : {
+        "revision" : "f6afa0132961d593f07970d84e2d8b588c29ea04",
+        "version" : "5.19.1"
+      }
+    },
     {
       "identity" : "sentry-cocoa",
       "kind" : "remoteSourceControl",

diff --git a/PocketKit/Package.swift b/PocketKit/Package.swift
@@ -34,7 +34,7 @@ let package = Package(
         .package(url: "https://github.com/airbnb/lottie-ios.git", from: "4.4.0"),
         .package(url: "https://github.com/johnxnguyen/Down", from: "0.11.0"),
         .package(url: "https://github.com/SvenTiigi/YouTubePlayerKit.git", from: "1.7.0"),
-        .package(url: "https://github.com/braze-inc/braze-swift-sdk-prebuilt-dynamic", from: "8.1.0"),
+        .package(url: "https://github.com/braze-inc/braze-swift-sdk.git", from: "8.1.0"),
         .package(url: "https://github.com/adjust/ios_sdk", from: "4.37.0"),
         .package(url: "https://github.com/RNCryptor/RNCryptor.git", from: "5.1.0"),
     ],
@@ -66,7 +66,7 @@ let package = Package(
                 "Textile",
                 "Sync",
                 .product(name: "Adjust", package: "ios_sdk"),
-                .product(name: "BrazeKit", package: "braze-swift-sdk-prebuilt-dynamic")
+                .product(name: "BrazeKit", package: "braze-swift-sdk")
             ],
             resources: [
                 .copy("Stickers")
@@ -83,8 +83,8 @@ let package = Package(
                 "PKTListen",
                 "DiffMatchPatch",
                 .product(name: "YouTubePlayerKit", package: "YouTubePlayerKit"),
-                .product(name: "BrazeKit", package: "braze-swift-sdk-prebuilt-dynamic"),
-                .product(name: "BrazeUI", package: "braze-swift-sdk-prebuilt-dynamic"),
+                .product(name: "BrazeKit", package: "braze-swift-sdk"),
+                .product(name: "BrazeUI", package: "braze-swift-sdk"),
                 .product(name: "Adjust", package: "ios_sdk"),
                 // Used by listen, ideally we put this there, but there were some c99 compilker issues, this used to be included by snowplow but is not anymore
                 .product(name: "FMDB", package: "fmdb")
@@ -103,7 +103,7 @@ let package = Package(
                 "Sync",
                 "Analytics",
                 .product(name: "Adjust", package: "ios_sdk"),
-                .product(name: "BrazeKit", package: "braze-swift-sdk-prebuilt-dynamic")
+                .product(name: "BrazeKit", package: "braze-swift-sdk")
             ]
         ),
         .testTarget(
@@ -118,7 +118,7 @@ let package = Package(
                 "Textile",
                 "Localization",
                 "RNCryptor",
-                .product(name: "BrazeKit", package: "braze-swift-sdk-prebuilt-dynamic"),
+                .product(name: "BrazeKit", package: "braze-swift-sdk"),
                 .product(name: "Sentry", package: "sentry-cocoa")
             ]
         ),