3.2.0

BatchFirebaseDispatcher.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'BatchFirebaseDispatcher'
-  s.version          = '3.1.0'
+  s.version          = '3.2.0'
   s.summary          = 'Batch.com Events Dispatcher Firebase implementation.'
 
   s.description      = <<-DESC
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.static_framework = true
 
-  s.dependency 'Batch', '~> 1.19'
+  s.dependency 'Batch', '>= 1.19'
   s.dependency 'Firebase/Analytics'
 
   s.source_files = 'BatchFirebaseDispatcher/Classes/**/*'

BatchFirebaseDispatcher.xcodeproj/project.pbxproj

@@ -3,21 +3,21 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		51053780241257F900589FC6 /* BatchFirebaseDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 5105377E241257F400589FC6 /* BatchFirebaseDispatcher.m */; };
 		51053781241257F900589FC6 /* BatchFirebaseDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 5105377F241257F400589FC6 /* BatchFirebaseDispatcher.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		51C49D7525F7B28800C8E4F6 /* Batch in Frameworks */ = {isa = PBXBuildFile; productRef = 51C49D7425F7B28800C8E4F6 /* Batch */; };
 		51C49D7C25F7B32F00C8E4F6 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 51C49D7B25F7B32F00C8E4F6 /* FirebaseAnalytics */; };
-		51C49D8425F7B40D00C8E4F6 /* OCMock.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51C49D8325F7B40D00C8E4F6 /* OCMock.xcframework */; };
 		51C49D8C25F7B44E00C8E4F6 /* Batch in Frameworks */ = {isa = PBXBuildFile; productRef = 51C49D8B25F7B44E00C8E4F6 /* Batch */; };
 		51C49D8E25F7B45000C8E4F6 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 51C49D8D25F7B45000C8E4F6 /* FirebaseAnalytics */; };
 		625AA2FA2424F4BB000DACC4 /* BatchFirebaseDispatcher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51D530C82412553C009E7531 /* BatchFirebaseDispatcher.framework */; };
 		625AA30E2424F59C000DACC4 /* BatchFirebaseDispatcherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 625AA3052424F538000DACC4 /* BatchFirebaseDispatcherTests.m */; };
 		625AA30F2424F59C000DACC4 /* BatchPayloadDispatcherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 625AA3062424F538000DACC4 /* BatchPayloadDispatcherTests.m */; };
 		625AA3132424F5E4000DACC4 /* Tests-Prefix.pch in Resources */ = {isa = PBXBuildFile; fileRef = 625AA3072424F538000DACC4 /* Tests-Prefix.pch */; };
+		7EF6AC6E2C8752E800644A09 /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 7EF6AC6D2C8752E800644A09 /* OCMock */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -45,7 +45,6 @@
 /* Begin PBXFileReference section */
 		5105377E241257F400589FC6 /* BatchFirebaseDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BatchFirebaseDispatcher.m; path = Classes/BatchFirebaseDispatcher.m; sourceTree = "<group>"; };
 		5105377F241257F400589FC6 /* BatchFirebaseDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BatchFirebaseDispatcher.h; path = Classes/BatchFirebaseDispatcher.h; sourceTree = "<group>"; };
-		51C49D8325F7B40D00C8E4F6 /* OCMock.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OCMock.xcframework; path = Carthage/Build/OCMock.xcframework; sourceTree = "<group>"; };
 		51D530C82412553C009E7531 /* BatchFirebaseDispatcher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BatchFirebaseDispatcher.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		51D530D3241256E8009E7531 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Module/Info.plist; sourceTree = "<group>"; };
 		625AA2F52424F4BB000DACC4 /* BatchFirebaseDispatcherTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BatchFirebaseDispatcherTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -64,7 +63,6 @@
 			files = (
 				51C49D7C25F7B32F00C8E4F6 /* FirebaseAnalytics in Frameworks */,
 				51C49D7525F7B28800C8E4F6 /* Batch in Frameworks */,
-				51C49D8425F7B40D00C8E4F6 /* OCMock.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -74,6 +72,7 @@
 			files = (
 				625AA2FA2424F4BB000DACC4 /* BatchFirebaseDispatcher.framework in Frameworks */,
 				51C49D8C25F7B44E00C8E4F6 /* Batch in Frameworks */,
+				7EF6AC6E2C8752E800644A09 /* OCMock in Frameworks */,
 				51C49D8E25F7B45000C8E4F6 /* FirebaseAnalytics in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -84,7 +83,6 @@
 		5105378224125A0100589FC6 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				51C49D8325F7B40D00C8E4F6 /* OCMock.xcframework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -185,6 +183,7 @@
 			packageProductDependencies = (
 				51C49D8B25F7B44E00C8E4F6 /* Batch */,
 				51C49D8D25F7B45000C8E4F6 /* FirebaseAnalytics */,
+				7EF6AC6D2C8752E800644A09 /* OCMock */,
 			);
 			productName = BatchFirebaseDispatcherTests;
 			productReference = 625AA2F52424F4BB000DACC4 /* BatchFirebaseDispatcherTests.xctest */;
@@ -219,6 +218,7 @@
 			packageReferences = (
 				51C49D7325F7B28800C8E4F6 /* XCRemoteSwiftPackageReference "Batch-iOS-SDK" */,
 				51C49D7A25F7B32F00C8E4F6 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
+				7EF6AC6C2C8752E800644A09 /* XCRemoteSwiftPackageReference "ocmock" */,
 			);
 			productRefGroup = 51D530C92412553C009E7531 /* Products */;
 			projectDirPath = "";
@@ -409,7 +409,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = U5K2ETC2Y6;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -428,7 +428,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.batch.ios.BatchFirebaseDispatcher;
 				PRODUCT_NAME = BatchFirebaseDispatcher;
 				SKIP_INSTALL = YES;
@@ -441,7 +441,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = U5K2ETC2Y6;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -460,7 +460,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.batch.ios.BatchFirebaseDispatcher;
 				PRODUCT_NAME = BatchFirebaseDispatcher;
 				SKIP_INSTALL = YES;
@@ -547,16 +547,26 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/BatchLabs/Batch-iOS-SDK.git";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.17.0;
+				kind = versionRange;
+				maximumVersion = 99.0.0;
+				minimumVersion = 1.19.0;
 			};
 		};
 		51C49D7A25F7B32F00C8E4F6 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 7.7.0;
+				kind = versionRange;
+				maximumVersion = 99.0.0;
+				minimumVersion = 8.10.0;
+			};
+		};
+		7EF6AC6C2C8752E800644A09 /* XCRemoteSwiftPackageReference "ocmock" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/erikdoe/ocmock";
+			requirement = {
+				kind = revision;
+				revision = 2c0bfd373289f4a7716db5d6db471640f91a6507;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
@@ -582,6 +592,11 @@
 			package = 51C49D7A25F7B32F00C8E4F6 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
 			productName = FirebaseAnalytics;
 		};
+		7EF6AC6D2C8752E800644A09 /* OCMock */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 7EF6AC6C2C8752E800644A09 /* XCRemoteSwiftPackageReference "ocmock" */;
+			productName = OCMock;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 51D530BF2412553B009E7531 /* Project object */;

BatchFirebaseDispatcher.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,84 +1,94 @@
 {
+  "originHash" : "2f38e8196e3b81607e3d7847d46f8545e5982e9c0354bc5cef4cca92dd26d7ac",
   "pins" : [
     {
-      "identity" : "abseil-cpp-swiftpm",
+      "identity" : "abseil-cpp-binary",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
       "state" : {
-        "revision" : "fffc3c2729be5747390ad02d5100291a0d9ad26a",
-        "version" : "0.20200225.4"
+        "revision" : "194a6706acbd25e4ef639bcaddea16e8758a3e27",
+        "version" : "1.2024011602.0"
       }
     },
     {
-      "identity" : "batch-ios-sdk",
+      "identity" : "app-check",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/BatchLabs/Batch-iOS-SDK.git",
+      "location" : "https://github.com/google/app-check.git",
       "state" : {
-        "revision" : "03d985539457918ecf1e191b69fd6d16538a6975",
-        "version" : "1.19.0"
+        "revision" : "21fe1af9be463a359aaf8d96789ef73fc3760d09",
+        "version" : "11.0.1"
       }
     },
     {
-      "identity" : "boringssl-swiftpm",
+      "identity" : "batch-ios-sdk",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/boringssl-SwiftPM.git",
+      "location" : "https://github.com/BatchLabs/Batch-iOS-SDK.git",
       "state" : {
-        "revision" : "734a8247442fde37df4364c21f6a0085b6a36728",
-        "version" : "0.7.2"
+        "revision" : "72ab052438d8eae2eb822d0442ea9c1c2e9f9701",
+        "version" : "2.0.2"
       }
     },
     {
       "identity" : "firebase-ios-sdk",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/firebase/firebase-ios-sdk",
       "state" : {
-        "revision" : "b97bfcd2e5eecc7aa7e1aeb27d097d610876cf93",
-        "version" : "7.11.1"
+        "revision" : "9118aca998dbe2ceac45d64b21a91c6376928df7",
+        "version" : "11.1.0"
       }
     },
     {
       "identity" : "googleappmeasurement",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleAppMeasurement.git",
       "state" : {
-        "revision" : "22cb3ab5588200b210ae01e42665f52ac4e8ad28",
-        "version" : "7.11.1"
+        "revision" : "07a2f57d147d2bf368a0d2dcb5579ff082d9e44f",
+        "version" : "11.1.0"
       }
     },
     {
       "identity" : "googledatatransport",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleDataTransport.git",
       "state" : {
-        "revision" : "369716b8d7518a530ce3c3a251436d72546debd8",
-        "version" : "8.4.0"
+        "revision" : "617af071af9aa1d6a091d59a202910ac482128f9",
+        "version" : "10.1.0"
       }
     },
     {
       "identity" : "googleutilities",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleUtilities.git",
       "state" : {
-        "revision" : "b3bb0c5551fb3f80ca939829639ab5b093edd14f",
-        "version" : "7.7.0"
+        "revision" : "53156c7ec267db846e6b64c9f4c4e31ba4cf75eb",
+        "version" : "8.0.2"
       }
     },
     {
-      "identity" : "grpc-swiftpm",
+      "identity" : "grpc-binary",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/firebase/grpc-SwiftPM.git",
+      "location" : "https://github.com/google/grpc-binary.git",
       "state" : {
-        "revision" : "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5",
-        "version" : "1.28.4"
+        "revision" : "f56d8fc3162de9a498377c7b6cea43431f4f5083",
+        "version" : "1.65.1"
       }
     },
     {
       "identity" : "gtm-session-fetcher",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/gtm-session-fetcher.git",
       "state" : {
-        "revision" : "eca9404a18f53727e4698211aaf2615eb93b962a",
-        "version" : "1.7.1"
+        "revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
+        "version" : "3.5.0"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "2d12673670417654f08f5f90fdd62926dc3a2648",
+        "version" : "100.0.0"
       }
     },
     {
@@ -95,17 +105,25 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/firebase/nanopb.git",
       "state" : {
-        "revision" : "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77",
-        "version" : "2.30908.0"
+        "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
+        "version" : "2.30910.0"
+      }
+    },
+    {
+      "identity" : "ocmock",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/erikdoe/ocmock",
+      "state" : {
+        "revision" : "2c0bfd373289f4a7716db5d6db471640f91a6507"
       }
     },
     {
       "identity" : "promises",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/promises.git",
       "state" : {
-        "revision" : "afa9a1ace74e116848d4f743599ab83e584ff8cb",
-        "version" : "1.2.12"
+        "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
+        "version" : "2.4.0"
       }
     },
     {
@@ -118,5 +136,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.2.0
+
+ * Added Batch SDK v2 support.
+
 ## 3.1.0
 
 _This version is not available on cocoapod as it only adds support for SPM._

Cartfile.resolved

@@ -1,3 +1,3 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "8.14.0"
-github "BatchLabs/ios-sdk" "1.19.0"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "11.1.0"
+github "BatchLabs/ios-sdk" "2.0.2"
 github "erikdoe/ocmock" "2bebc53a4d2e4292fa50e7a95bbe2f41b98496f9"

Makefile

@@ -1,7 +1,7 @@
 all: framework
 
 PROJECT=BatchFirebaseDispatcher.xcodeproj
-SIMULATOR='platform=iOS Simulator,name=iPhone 11'
+SIMULATOR='platform=iOS Simulator,name=iPhone 15'
 DERIVED_DATA=$(CURDIR)/DerivedData
 SONAR_HOME=$(CURDIR)/.sonar
 SONAR_WORKDIR=$(CURDIR)/.scannerwork/
@@ -40,6 +40,6 @@ remove-package:
 carthage:
 	carthage bootstrap --platform ios --use-xcframeworks
 
-ci: carthage test
+ci: test
 
 .PHONY: carthage test

Package.resolved

@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/BatchLabs/Batch-iOS-SDK",
       "state" : {
-        "revision" : "52640fa8f487e502e38e5d1d36a0e4c0006e546e",
-        "version" : "1.19.2"
+        "revision" : "72ab052438d8eae2eb822d0442ea9c1c2e9f9701",
+        "version" : "2.0.2"
       }
     },
     {

Package.swift

@@ -13,7 +13,7 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/BatchLabs/Batch-iOS-SDK", from: "1.19.0"),
+        .package(url: "https://github.com/BatchLabs/Batch-iOS-SDK","1.19.0"..."99.0.0"),
         .package(url: "https://github.com/firebase/firebase-ios-sdk", "8.10.0"..."99.0.0"),
     ],
     targets: [