diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 6fbf518..0d63d57 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -4,7 +4,7 @@ on: [push] jobs: build: - runs-on: macOS-latest + runs-on: macos-15 steps: - uses: actions/checkout@v2 - name: Run CI diff --git a/.gitignore b/.gitignore index acdf35c..5fd3f2d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ Carthage Example/Pods/ .scannerwork/ .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata + +.build/ diff --git a/BatchFirebaseDispatcher.podspec b/BatchFirebaseDispatcher.podspec index d103bb6..5cc31dd 100644 --- a/BatchFirebaseDispatcher.podspec +++ b/BatchFirebaseDispatcher.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'BatchFirebaseDispatcher' - s.version = '3.2.0' + s.version = '4.0.0' s.summary = 'Batch.com Events Dispatcher Firebase implementation.' s.description = <<-DESC @@ -12,9 +12,9 @@ Pod::Spec.new do |s| s.author = { 'Batch.com' => 'support@batch.com' } s.source = { :git => 'https://github.com/BatchLabs/Batch-iOS-firebase-dispatcher.git', :tag => s.version.to_s } - s.ios.deployment_target = '10.0' + s.ios.deployment_target = '15.0' s.platforms = { - "ios" => "10.0" + "ios" => "15.0" } s.requires_arc = true diff --git a/BatchFirebaseDispatcher.xcodeproj/project.pbxproj b/BatchFirebaseDispatcher.xcodeproj/project.pbxproj index 7c6cbf4..ed2fdbc 100644 --- a/BatchFirebaseDispatcher.xcodeproj/project.pbxproj +++ b/BatchFirebaseDispatcher.xcodeproj/project.pbxproj @@ -339,7 +339,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -394,7 +394,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -409,7 +409,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 6; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = U5K2ETC2Y6; DYLIB_COMPATIBILITY_VERSION = 1; @@ -421,14 +421,14 @@ ); INFOPLIST_FILE = "$(SRCROOT)/BatchFirebaseDispatcher/Module/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); MACH_O_TYPE = staticlib; - MARKETING_VERSION = 3.2.0; + MARKETING_VERSION = 4.0.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 = 5; + CURRENT_PROJECT_VERSION = 6; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = U5K2ETC2Y6; DYLIB_COMPATIBILITY_VERSION = 1; @@ -453,14 +453,14 @@ ); INFOPLIST_FILE = "$(SRCROOT)/BatchFirebaseDispatcher/Module/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); MACH_O_TYPE = staticlib; - MARKETING_VERSION = 3.2.0; + MARKETING_VERSION = 4.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.batch.ios.BatchFirebaseDispatcher; PRODUCT_NAME = BatchFirebaseDispatcher; SKIP_INSTALL = YES; diff --git a/BatchFirebaseDispatcher.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/BatchFirebaseDispatcher.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index ffbb3e2..59c22ed 100644 --- a/BatchFirebaseDispatcher.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/BatchFirebaseDispatcher.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/abseil-cpp-binary.git", "state" : { - "revision" : "194a6706acbd25e4ef639bcaddea16e8758a3e27", - "version" : "1.2024011602.0" + "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5", + "version" : "1.2024072200.0" } }, { @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/app-check.git", "state" : { - "revision" : "21fe1af9be463a359aaf8d96789ef73fc3760d09", - "version" : "11.0.1" + "revision" : "61b85103a1aeed8218f17c794687781505fbbef5", + "version" : "11.2.0" } }, { @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/BatchLabs/Batch-iOS-SDK.git", "state" : { - "revision" : "72ab052438d8eae2eb822d0442ea9c1c2e9f9701", - "version" : "2.0.2" + "revision" : "4c6c2b321d65eebd2df6f048395b2f3168ec24b2", + "version" : "3.0.1" } }, { @@ -33,8 +33,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/firebase/firebase-ios-sdk", "state" : { - "revision" : "9118aca998dbe2ceac45d64b21a91c6376928df7", - "version" : "11.1.0" + "revision" : "4e62da1e5e6baf61674d3f5ae23d6d60c19f9c4a", + "version" : "12.0.0" + } + }, + { + "identity" : "google-ads-on-device-conversion-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk", + "state" : { + "revision" : "428d8bb138e00f9a3f4f61cc6cd8863607524f65", + "version" : "2.1.0" } }, { @@ -42,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/GoogleAppMeasurement.git", "state" : { - "revision" : "07a2f57d147d2bf368a0d2dcb5579ff082d9e44f", - "version" : "11.1.0" + "revision" : "63c18311aac00032f15f5ce431c9e83ada96c386", + "version" : "12.0.0" } }, { @@ -60,8 +69,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/GoogleUtilities.git", "state" : { - "revision" : "53156c7ec267db846e6b64c9f4c4e31ba4cf75eb", - "version" : "8.0.2" + "revision" : "60da361632d0de02786f709bdc0c4df340f7613e", + "version" : "8.1.0" } }, { @@ -69,8 +78,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/grpc-binary.git", "state" : { - "revision" : "f56d8fc3162de9a498377c7b6cea43431f4f5083", - "version" : "1.65.1" + "revision" : "cc0001a0cf963aa40501d9c2b181e7fc9fd8ec71", + "version" : "1.69.0" } }, { @@ -78,8 +87,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/gtm-session-fetcher.git", "state" : { - "revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b", - "version" : "3.5.0" + "revision" : "fb7f2740b1570d2f7599c6bb9531bf4fad6974b7", + "version" : "5.0.0" } }, { @@ -87,8 +96,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/interop-ios-for-google-sdks.git", "state" : { - "revision" : "2d12673670417654f08f5f90fdd62926dc3a2648", - "version" : "100.0.0" + "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe", + "version" : "101.0.0" } }, { @@ -96,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/firebase/leveldb.git", "state" : { - "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", - "version" : "1.22.2" + "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1", + "version" : "1.22.5" } }, { @@ -131,8 +140,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "e1499bc69b9040b29184f7f2996f7bab467c1639", - "version" : "1.19.0" + "revision" : "102a647b573f60f73afdce5613a51d71349fe507", + "version" : "1.30.0" } } ], diff --git a/CHANGELOG.md b/CHANGELOG.md index fbae4b8..dae9a0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 4.0.0 + + * Batch Firebase Dispatcher now requires iOS 15.0 or higher + ## 3.2.0 * Added Batch SDK v2 support. diff --git a/Makefile b/Makefile index 4483a12..eebc1c7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ all: framework PROJECT=BatchFirebaseDispatcher.xcodeproj -SIMULATOR='platform=iOS Simulator,name=iPhone 15' +SIMULATOR='platform=iOS Simulator,name=iPhone 16' DERIVED_DATA=$(CURDIR)/DerivedData SONAR_HOME=$(CURDIR)/.sonar SONAR_WORKDIR=$(CURDIR)/.scannerwork/ diff --git a/Package.resolved b/Package.resolved index fe6cecc..1827427 100644 --- a/Package.resolved +++ b/Package.resolved @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/GoogleUtilities.git", "state" : { - "revision" : "68ea347bdb1a69e2d2ae2e25cd085b6ef92f64cb", - "version" : "7.9.0" + "revision" : "57a1d307f42df690fdef2637f3e5b776da02aad6", + "version" : "7.13.3" } }, { @@ -104,8 +104,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/promises.git", "state" : { - "revision" : "3e4e743631e86c8c70dbc6efdc7beaa6e90fd3bb", - "version" : "2.1.1" + "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac", + "version" : "2.4.0" } }, { @@ -113,8 +113,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "88c7d15e1242fdb6ecbafbc7926426a19be1e98a", - "version" : "1.20.2" + "revision" : "102a647b573f60f73afdce5613a51d71349fe507", + "version" : "1.30.0" } } ], diff --git a/Package.swift b/Package.swift index f7ab843..fd6b700 100644 --- a/Package.swift +++ b/Package.swift @@ -5,6 +5,9 @@ import PackageDescription let package = Package( name: "BatchFirebaseDispatcher", defaultLocalization: "en", + platforms: [ + .iOS(.v15) + ], products: [ // Products define the executables and libraries a package produces, and make them visible to other packages. .library( diff --git a/README.md b/README.md index d252933..5be5a2c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ You can find a guide explaining how to use the reported events [here](https://he # Requirements - Xcode 13 - - iOS 10+ + - iOS 15+ - Batch 1.19+ - Firebase 8.10+