From 4748fbf4cd3dcf699755c6462762d5814db15018 Mon Sep 17 00:00:00 2001 From: Len Li Date: Mon, 7 Jun 2021 23:03:54 -0400 Subject: [PATCH 01/15] Remove NSLog from formatFirebaseNameString --- Segment-Firebase/Classes/SEGFirebaseIntegration.m | 1 - 1 file changed, 1 deletion(-) diff --git a/Segment-Firebase/Classes/SEGFirebaseIntegration.m b/Segment-Firebase/Classes/SEGFirebaseIntegration.m index 48dd6ca..ece75d6 100644 --- a/Segment-Firebase/Classes/SEGFirebaseIntegration.m +++ b/Segment-Firebase/Classes/SEGFirebaseIntegration.m @@ -103,7 +103,6 @@ + (NSString *)formatFirebaseNameString:(NSString *)name NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"([^a-zA-Z0-9_])" options:0 error:&error]; NSString *formatted = [regex stringByReplacingMatchesInString:trimmed options:0 range:NSMakeRange(0, [trimmed length]) withTemplate:@"_"]; - NSLog(@"Output: %@", formatted); return [formatted substringToIndex:MIN(40, [formatted length])]; } From 7f487a4771cb89379a47a9736757b935d5685ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Sol=C3=ADs?= Date: Mon, 20 Sep 2021 13:00:51 -0500 Subject: [PATCH 02/15] fix: bump firebase dependency --- Segment-Firebase.podspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index fe99b08..4c1974b 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -24,9 +24,9 @@ Pod::Spec.new do |s| s.static_framework = true s.dependency 'Analytics' - s.dependency 'Firebase', '~> 7.7' - s.dependency 'Firebase/Core', '~> 7.7' - s.dependency 'FirebaseAnalytics','~> 7.7' + s.dependency 'Firebase', '~> 7.8' + s.dependency 'Firebase/Core', '~> 7.8' + s.dependency 'FirebaseAnalytics','~> 7.8' s.subspec 'Core' do |core| #For users who only want the core Firebase package From 99a2db04e659fcc6f256e18ddf0bad0ea28b6a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Sol=C3=ADs?= Date: Mon, 20 Sep 2021 13:20:21 -0500 Subject: [PATCH 03/15] chore: bumps firebase to 8.7.0 --- Example/Podfile.lock | 160 +++++++++++++++++++-------------------- Package.swift | 4 +- Segment-Firebase.podspec | 6 +- 3 files changed, 84 insertions(+), 86 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index ade90bd..d136901 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,82 +1,80 @@ PODS: - - Analytics (4.1.4) + - Analytics (4.1.5) - Expecta (1.0.6) - - Firebase (7.11.0): - - Firebase/Core (= 7.11.0) - - Firebase/Core (7.11.0): + - Firebase (8.7.0): + - Firebase/Core (= 8.7.0) + - Firebase/Core (8.7.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 7.11.0) - - Firebase/CoreOnly (7.11.0): - - FirebaseCore (= 7.11.0) - - FirebaseAnalytics (7.11.0): - - FirebaseAnalytics/AdIdSupport (= 7.11.0) - - FirebaseCore (~> 7.0) - - FirebaseInstallations (~> 7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - - GoogleUtilities/MethodSwizzler (~> 7.0) - - GoogleUtilities/Network (~> 7.0) - - "GoogleUtilities/NSData+zlib (~> 7.0)" + - FirebaseAnalytics (~> 8.7.0) + - Firebase/CoreOnly (8.7.0): + - FirebaseCore (= 8.7.0) + - FirebaseAnalytics (8.7.0): + - FirebaseAnalytics/AdIdSupport (= 8.7.0) + - FirebaseCore (~> 8.0) + - FirebaseInstallations (~> 8.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.4) + - GoogleUtilities/MethodSwizzler (~> 7.4) + - GoogleUtilities/Network (~> 7.4) + - "GoogleUtilities/NSData+zlib (~> 7.4)" - nanopb (~> 2.30908.0) - - FirebaseAnalytics/AdIdSupport (7.11.0): - - FirebaseAnalytics/Base (= 7.11.0) - - FirebaseCore (~> 7.0) - - FirebaseInstallations (~> 7.0) - - GoogleAppMeasurement/AdIdSupport (= 7.11.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - - GoogleUtilities/MethodSwizzler (~> 7.0) - - GoogleUtilities/Network (~> 7.0) - - "GoogleUtilities/NSData+zlib (~> 7.0)" + - FirebaseAnalytics/AdIdSupport (8.7.0): + - FirebaseCore (~> 8.0) + - FirebaseInstallations (~> 8.0) + - GoogleAppMeasurement (= 8.7.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.4) + - GoogleUtilities/MethodSwizzler (~> 7.4) + - GoogleUtilities/Network (~> 7.4) + - "GoogleUtilities/NSData+zlib (~> 7.4)" - nanopb (~> 2.30908.0) - - FirebaseAnalytics/Base (7.11.0): - - FirebaseCore (~> 7.0) - - FirebaseInstallations (~> 7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - - GoogleUtilities/MethodSwizzler (~> 7.0) - - GoogleUtilities/Network (~> 7.0) - - "GoogleUtilities/NSData+zlib (~> 7.0)" + - FirebaseCore (8.7.0): + - FirebaseCoreDiagnostics (~> 8.0) + - GoogleUtilities/Environment (~> 7.4) + - GoogleUtilities/Logger (~> 7.4) + - FirebaseCoreDiagnostics (8.7.0): + - GoogleDataTransport (~> 9.0) + - GoogleUtilities/Environment (~> 7.4) + - GoogleUtilities/Logger (~> 7.4) - nanopb (~> 2.30908.0) - - FirebaseCore (7.11.0): - - FirebaseCoreDiagnostics (~> 7.4) - - GoogleUtilities/Environment (~> 7.0) - - GoogleUtilities/Logger (~> 7.0) - - FirebaseCoreDiagnostics (7.11.0): - - GoogleDataTransport (~> 8.4) - - GoogleUtilities/Environment (~> 7.0) - - GoogleUtilities/Logger (~> 7.0) + - FirebaseInstallations (8.7.0): + - FirebaseCore (~> 8.0) + - GoogleUtilities/Environment (~> 7.4) + - GoogleUtilities/UserDefaults (~> 7.4) + - PromisesObjC (< 3.0, >= 1.2) + - GoogleAppMeasurement (8.7.0): + - GoogleAppMeasurement/AdIdSupport (= 8.7.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.4) + - GoogleUtilities/MethodSwizzler (~> 7.4) + - GoogleUtilities/Network (~> 7.4) + - "GoogleUtilities/NSData+zlib (~> 7.4)" - nanopb (~> 2.30908.0) - - FirebaseInstallations (7.11.0): - - FirebaseCore (~> 7.0) - - GoogleUtilities/Environment (~> 7.0) - - GoogleUtilities/UserDefaults (~> 7.0) - - PromisesObjC (~> 1.2) - - GoogleAppMeasurement/AdIdSupport (7.11.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - - GoogleUtilities/MethodSwizzler (~> 7.0) - - GoogleUtilities/Network (~> 7.0) - - "GoogleUtilities/NSData+zlib (~> 7.0)" + - GoogleAppMeasurement/AdIdSupport (8.7.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.4) + - GoogleUtilities/MethodSwizzler (~> 7.4) + - GoogleUtilities/Network (~> 7.4) + - "GoogleUtilities/NSData+zlib (~> 7.4)" - nanopb (~> 2.30908.0) - - GoogleDataTransport (8.4.0): + - GoogleDataTransport (9.1.0): - GoogleUtilities/Environment (~> 7.2) - nanopb (~> 2.30908.0) - - PromisesObjC (~> 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.4.1): + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/AppDelegateSwizzler (7.5.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.4.1): - - PromisesObjC (~> 1.2) - - GoogleUtilities/Logger (7.4.1): + - GoogleUtilities/Environment (7.5.2): + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/Logger (7.5.2): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.4.1): + - GoogleUtilities/MethodSwizzler (7.5.2): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.4.1): + - GoogleUtilities/Network (7.5.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.4.1)" - - GoogleUtilities/Reachability (7.4.1): + - "GoogleUtilities/NSData+zlib (7.5.2)" + - GoogleUtilities/Reachability (7.5.2): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.4.1): + - GoogleUtilities/UserDefaults (7.5.2): - GoogleUtilities/Logger - nanopb (2.30908.0): - nanopb/decode (= 2.30908.0) @@ -86,18 +84,18 @@ PODS: - OCHamcrest (8.0.0) - OCMockito (6.0.0): - OCHamcrest (~> 8.0) - - PromisesObjC (1.2.12) - - Segment-Firebase (2.7.6): + - PromisesObjC (2.0.0) + - Segment-Firebase (2.7.7): - Analytics - - Firebase (~> 7.7) - - Firebase/Core (~> 7.7) - - FirebaseAnalytics (~> 7.7) - - Segment-Firebase/Core (= 2.7.6) - - Segment-Firebase/Core (2.7.6): + - Firebase (~> 8.7) + - Firebase/Core (~> 8.7) + - FirebaseAnalytics (~> 8.7) + - Segment-Firebase/Core (= 2.7.7) + - Segment-Firebase/Core (2.7.7): - Analytics - - Firebase (~> 7.7) - - Firebase/Core (~> 7.7) - - FirebaseAnalytics (~> 7.7) + - Firebase (~> 8.7) + - Firebase/Core (~> 8.7) + - FirebaseAnalytics (~> 8.7) - Specta (1.0.7) DEPENDENCIES: @@ -129,21 +127,21 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Analytics: 7bdc735c456434b4eaa2eacdcf122bb03d51ede7 + Analytics: 084a3edda6517e308007c1a7810b8f1e8f2925aa Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 - Firebase: c121feb35e4126c0b355e3313fa9b487d47319fd - FirebaseAnalytics: cd3bd84d722a24a8923918af8af8e5236f615d77 - FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432 - FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c - FirebaseInstallations: a58d4f72ec5861840b84df489f2668d970df558a - GoogleAppMeasurement: fd19169c3034975cb934e865e5667bfdce59df7f - GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7 - GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20 + Firebase: bc9325d5ee2041524bac78a5213d0e530c651309 + FirebaseAnalytics: 52768800c2add1d84b751420cb4caaf8195f2c41 + FirebaseCore: f4804c1d3f4bbbefc88904d15653038f2c99ddf7 + FirebaseCoreDiagnostics: b63732f581a1c6a453ec7241f9ab60b3a5bd3450 + FirebaseInstallations: ede6fb72bb6337914e5888b399271259d0c4910c + GoogleAppMeasurement: 2be61ce546ad074dbe4dd545f222ac6033bb1d9e + GoogleDataTransport: 85fd18ff3019bb85d3f2c551d04c481dedf71fc9 + GoogleUtilities: 8de2a97a17e15b6b98e38e8770e2d129a57c0040 nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 OCHamcrest: a613690381f1dac7637c18962c10dbe8feca4bb5 OCMockito: 780f04370226f81a9d972c97d1203864ef609f5b - PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 - Segment-Firebase: 803612e886720f0d7d819871cf279c748ce6e187 + PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 + Segment-Firebase: 0804cc9fd7e5acb82c874d914c5cf38a1f919647 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 PODFILE CHECKSUM: 6ed9d49cabf18e7f28eb6b1e1c6f84ce781f3324 diff --git a/Package.swift b/Package.swift index c39d487..abc5ef3 100644 --- a/Package.swift +++ b/Package.swift @@ -3,11 +3,11 @@ import PackageDescription let package = Package( name: "SegmentFirebase", - platforms: [.iOS(.v10)], + platforms: [.iOS(.v11)], products: [.library(name: "SegmentFirebase", targets: ["SegmentFirebase"])], dependencies: [ .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.3"), - .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "7.5.0"), + .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "8.7.0"), ], targets: [ .target( diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index 4c1974b..cea3e8e 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -24,9 +24,9 @@ Pod::Spec.new do |s| s.static_framework = true s.dependency 'Analytics' - s.dependency 'Firebase', '~> 7.8' - s.dependency 'Firebase/Core', '~> 7.8' - s.dependency 'FirebaseAnalytics','~> 7.8' + s.dependency 'Firebase', '~> 8.7' + s.dependency 'Firebase/Core', '~> 8.7' + s.dependency 'FirebaseAnalytics','~> 8.7' s.subspec 'Core' do |core| #For users who only want the core Firebase package From cd3a1d7343d6c91026ad5ebfb41eec8bb81cd5c9 Mon Sep 17 00:00:00 2001 From: Brandon Sneed Date: Thu, 14 Oct 2021 13:03:32 -0700 Subject: [PATCH 04/15] Prepare for release 2.7.8. --- CHANGELOG.md | 4 ++++ Segment-Firebase.podspec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2e37c2..565ddd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Change Log ========== +Version 2.7.8 *(14th October, 2021)* +------------------------------------------- +* Bumped Firebase to version 8.7+ + Version 2.7.7 *(24th May, 2021)* ------------------------------------------- * Fix incorrect array being used for recursive mapping. diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index cea3e8e..11ca858 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Firebase" - s.version = "2.7.7" + s.version = "2.7.8" s.summary = "Firebase Integration for Segment's analytics-ios library." s.description = <<-DESC From 2325af1d7377fdd4aebbe3acdd4d501d87404b27 Mon Sep 17 00:00:00 2001 From: Krzysztof Date: Tue, 16 Nov 2021 14:24:12 +0100 Subject: [PATCH 05/15] Fix: cannot build with Swift Package Manager --- Segment-Firebase/Classes/SEGFirebaseIntegration.m | 2 +- Segment-Firebase/Classes/SEGFirebaseIntegrationFactory.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Segment-Firebase/Classes/SEGFirebaseIntegration.m b/Segment-Firebase/Classes/SEGFirebaseIntegration.m index ece75d6..02db55d 100644 --- a/Segment-Firebase/Classes/SEGFirebaseIntegration.m +++ b/Segment-Firebase/Classes/SEGFirebaseIntegration.m @@ -6,7 +6,7 @@ #if defined(__has_include) && __has_include() #import #else -#import +@import Segment; #endif diff --git a/Segment-Firebase/Classes/SEGFirebaseIntegrationFactory.h b/Segment-Firebase/Classes/SEGFirebaseIntegrationFactory.h index 3b24e2d..ed0f21a 100644 --- a/Segment-Firebase/Classes/SEGFirebaseIntegrationFactory.h +++ b/Segment-Firebase/Classes/SEGFirebaseIntegrationFactory.h @@ -3,7 +3,7 @@ #if defined(__has_include) && __has_include() #import #else -#import +@import Segment; #endif From b859d556db2403aa8c459485dac7e5a01a61dab0 Mon Sep 17 00:00:00 2001 From: Brandon Sneed Date: Fri, 21 Jan 2022 12:48:50 -0800 Subject: [PATCH 06/15] Prepare for release 2.7.9 --- CHANGELOG.md | 5 ++ Example/Podfile.lock | 133 ++++++++++++++++++++------------------- Package.resolved | 20 +++--- RELEASING.md | 5 +- Segment-Firebase.podspec | 2 +- 5 files changed, 90 insertions(+), 75 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 565ddd5..63e53b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Change Log ========== +Version 2.7.9 *(21st January, 2022)* +------------------------------------------- +* Fix compilation issue w/ SPM. +* Updated releasing.md to include steps for posting SPM releases. + Version 2.7.8 *(14th October, 2021)* ------------------------------------------- * Bumped Firebase to version 8.7+ diff --git a/Example/Podfile.lock b/Example/Podfile.lock index d136901..6240b87 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,80 +1,87 @@ PODS: - - Analytics (4.1.5) + - Analytics (4.1.6) - Expecta (1.0.6) - - Firebase (8.7.0): - - Firebase/Core (= 8.7.0) - - Firebase/Core (8.7.0): + - Firebase (8.10.0): + - Firebase/Core (= 8.10.0) + - Firebase/Core (8.10.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 8.7.0) - - Firebase/CoreOnly (8.7.0): - - FirebaseCore (= 8.7.0) - - FirebaseAnalytics (8.7.0): - - FirebaseAnalytics/AdIdSupport (= 8.7.0) + - FirebaseAnalytics (~> 8.10.0) + - Firebase/CoreOnly (8.10.0): + - FirebaseCore (= 8.10.0) + - FirebaseAnalytics (8.10.0): + - FirebaseAnalytics/AdIdSupport (= 8.10.0) - FirebaseCore (~> 8.0) - FirebaseInstallations (~> 8.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.4) - - GoogleUtilities/MethodSwizzler (~> 7.4) - - GoogleUtilities/Network (~> 7.4) - - "GoogleUtilities/NSData+zlib (~> 7.4)" + - GoogleUtilities/AppDelegateSwizzler (~> 7.6) + - GoogleUtilities/MethodSwizzler (~> 7.6) + - GoogleUtilities/Network (~> 7.6) + - "GoogleUtilities/NSData+zlib (~> 7.6)" - nanopb (~> 2.30908.0) - - FirebaseAnalytics/AdIdSupport (8.7.0): + - FirebaseAnalytics/AdIdSupport (8.10.0): - FirebaseCore (~> 8.0) - FirebaseInstallations (~> 8.0) - - GoogleAppMeasurement (= 8.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.4) - - GoogleUtilities/MethodSwizzler (~> 7.4) - - GoogleUtilities/Network (~> 7.4) - - "GoogleUtilities/NSData+zlib (~> 7.4)" + - GoogleAppMeasurement (= 8.10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.6) + - GoogleUtilities/MethodSwizzler (~> 7.6) + - GoogleUtilities/Network (~> 7.6) + - "GoogleUtilities/NSData+zlib (~> 7.6)" - nanopb (~> 2.30908.0) - - FirebaseCore (8.7.0): + - FirebaseCore (8.10.0): - FirebaseCoreDiagnostics (~> 8.0) - - GoogleUtilities/Environment (~> 7.4) - - GoogleUtilities/Logger (~> 7.4) - - FirebaseCoreDiagnostics (8.7.0): - - GoogleDataTransport (~> 9.0) - - GoogleUtilities/Environment (~> 7.4) - - GoogleUtilities/Logger (~> 7.4) + - GoogleUtilities/Environment (~> 7.6) + - GoogleUtilities/Logger (~> 7.6) + - FirebaseCoreDiagnostics (8.11.0): + - GoogleDataTransport (~> 9.1) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Logger (~> 7.7) - nanopb (~> 2.30908.0) - - FirebaseInstallations (8.7.0): + - FirebaseInstallations (8.11.0): - FirebaseCore (~> 8.0) - - GoogleUtilities/Environment (~> 7.4) - - GoogleUtilities/UserDefaults (~> 7.4) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/UserDefaults (~> 7.7) - PromisesObjC (< 3.0, >= 1.2) - - GoogleAppMeasurement (8.7.0): - - GoogleAppMeasurement/AdIdSupport (= 8.7.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.4) - - GoogleUtilities/MethodSwizzler (~> 7.4) - - GoogleUtilities/Network (~> 7.4) - - "GoogleUtilities/NSData+zlib (~> 7.4)" + - GoogleAppMeasurement (8.10.0): + - GoogleAppMeasurement/AdIdSupport (= 8.10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.6) + - GoogleUtilities/MethodSwizzler (~> 7.6) + - GoogleUtilities/Network (~> 7.6) + - "GoogleUtilities/NSData+zlib (~> 7.6)" - nanopb (~> 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (8.7.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.4) - - GoogleUtilities/MethodSwizzler (~> 7.4) - - GoogleUtilities/Network (~> 7.4) - - "GoogleUtilities/NSData+zlib (~> 7.4)" + - GoogleAppMeasurement/AdIdSupport (8.10.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 8.10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.6) + - GoogleUtilities/MethodSwizzler (~> 7.6) + - GoogleUtilities/Network (~> 7.6) + - "GoogleUtilities/NSData+zlib (~> 7.6)" - nanopb (~> 2.30908.0) - - GoogleDataTransport (9.1.0): + - GoogleAppMeasurement/WithoutAdIdSupport (8.10.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.6) + - GoogleUtilities/MethodSwizzler (~> 7.6) + - GoogleUtilities/Network (~> 7.6) + - "GoogleUtilities/NSData+zlib (~> 7.6)" + - nanopb (~> 2.30908.0) + - GoogleDataTransport (9.1.2): - GoogleUtilities/Environment (~> 7.2) - nanopb (~> 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.5.2): + - GoogleUtilities/AppDelegateSwizzler (7.7.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.5.2): + - GoogleUtilities/Environment (7.7.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.5.2): + - GoogleUtilities/Logger (7.7.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.5.2): + - GoogleUtilities/MethodSwizzler (7.7.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.5.2): + - GoogleUtilities/Network (7.7.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.5.2)" - - GoogleUtilities/Reachability (7.5.2): + - "GoogleUtilities/NSData+zlib (7.7.0)" + - GoogleUtilities/Reachability (7.7.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.5.2): + - GoogleUtilities/UserDefaults (7.7.0): - GoogleUtilities/Logger - nanopb (2.30908.0): - nanopb/decode (= 2.30908.0) @@ -85,13 +92,13 @@ PODS: - OCMockito (6.0.0): - OCHamcrest (~> 8.0) - PromisesObjC (2.0.0) - - Segment-Firebase (2.7.7): + - Segment-Firebase (2.7.8): - Analytics - Firebase (~> 8.7) - Firebase/Core (~> 8.7) - FirebaseAnalytics (~> 8.7) - - Segment-Firebase/Core (= 2.7.7) - - Segment-Firebase/Core (2.7.7): + - Segment-Firebase/Core (= 2.7.8) + - Segment-Firebase/Core (2.7.8): - Analytics - Firebase (~> 8.7) - Firebase/Core (~> 8.7) @@ -127,23 +134,23 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Analytics: 084a3edda6517e308007c1a7810b8f1e8f2925aa + Analytics: eefe524436f904b8bb3f8c8c3425280e43b34efc Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 - Firebase: bc9325d5ee2041524bac78a5213d0e530c651309 - FirebaseAnalytics: 52768800c2add1d84b751420cb4caaf8195f2c41 - FirebaseCore: f4804c1d3f4bbbefc88904d15653038f2c99ddf7 - FirebaseCoreDiagnostics: b63732f581a1c6a453ec7241f9ab60b3a5bd3450 - FirebaseInstallations: ede6fb72bb6337914e5888b399271259d0c4910c - GoogleAppMeasurement: 2be61ce546ad074dbe4dd545f222ac6033bb1d9e - GoogleDataTransport: 85fd18ff3019bb85d3f2c551d04c481dedf71fc9 - GoogleUtilities: 8de2a97a17e15b6b98e38e8770e2d129a57c0040 + Firebase: 44213362f1dcc52555b935dc925ed35ac55f1b20 + FirebaseAnalytics: 319c9b3b1bdd400d60e2f415dff0c5f6959e6760 + FirebaseCore: 04186597c095da37d90ff9fd3e53bc61a1ff2440 + FirebaseCoreDiagnostics: 64d9709d804a6c25bd77841371c1fcfd909d5601 + FirebaseInstallations: 044eede8a049bce71c4541ee68d6e4364fcbe774 + GoogleAppMeasurement: a3311dbcf3ea651e5a070fe8559b57c174ada081 + GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 + GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 OCHamcrest: a613690381f1dac7637c18962c10dbe8feca4bb5 OCMockito: 780f04370226f81a9d972c97d1203864ef609f5b PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 - Segment-Firebase: 0804cc9fd7e5acb82c874d914c5cf38a1f919647 + Segment-Firebase: e4515bc7e36d5f0435d122a8c225c43db1504c02 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 PODFILE CHECKSUM: 6ed9d49cabf18e7f28eb6b1e1c6f84ce781f3324 -COCOAPODS: 1.10.1 +COCOAPODS: 1.11.2 diff --git a/Package.resolved b/Package.resolved index ea000db..d2b6819 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", "state": { "branch": null, - "revision": "ff5f5f0a3d3266836b9d722bb73cabdf7057482e", - "version": "0.20200225.3" + "revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a", + "version": "0.20200225.4" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", "state": { "branch": null, - "revision": "b97bfcd2e5eecc7aa7e1aeb27d097d610876cf93", - "version": "7.11.1" + "revision": "5344857522053b5d4403ec8173ec0d23200a97ea", + "version": "8.11.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", "state": { "branch": null, - "revision": "22cb3ab5588200b210ae01e42665f52ac4e8ad28", - "version": "7.11.1" + "revision": "9b2f6aca5b4685c45f9f5481f19bee8e7982c538", + "version": "8.9.1" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/google/GoogleDataTransport.git", "state": { "branch": null, - "revision": "369716b8d7518a530ce3c3a251436d72546debd8", - "version": "8.4.0" + "revision": "15ccdfd25ac55b9239b82809531ff26605e7556e", + "version": "9.1.2" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/google/GoogleUtilities.git", "state": { "branch": null, - "revision": "66f5945ac3a4c4ac268bf94c31f226116b14e327", - "version": "7.4.0" + "revision": "b3bb0c5551fb3f80ca939829639ab5b093edd14f", + "version": "7.7.0" } }, { diff --git a/RELEASING.md b/RELEASING.md index 010c3f3..e94eb14 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -9,4 +9,7 @@ Releasing 6. `pod trunk push Segment-Firebase.podspec --allow-warnings` 7. Update the version `Segment-Firebase.podspec` to the next beta version. 8. `git commit -am "Prepare next development version."` - 9. `git push` \ No newline at end of file + 9. `git push` + 10. Make a new release on the github releases page here: + https://github.com/segment-integrations/analytics-ios-integration-firebase/releases + \ No newline at end of file diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index 11ca858..c48e4fd 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Firebase" - s.version = "2.7.8" + s.version = "2.7.9" s.summary = "Firebase Integration for Segment's analytics-ios library." s.description = <<-DESC From 6213f765cceb443df71b3709e8511e50507d624e Mon Sep 17 00:00:00 2001 From: Fabricio Bertani Date: Wed, 22 Jun 2022 17:19:08 -0300 Subject: [PATCH 07/15] Chore: update firebase version to 9.1.0 (#89) * Updated Firebase packages to 9.1.0 Updated platform required version to 11 * Removed unnecessary using on SEGFirebaseIntegration * Updated Package.resolved Co-authored-by: Fabricio Bertani --- Example/Podfile | 2 +- Package.resolved | 50 +++++++++---------- Package.swift | 6 +-- Segment-Firebase.podspec | 8 +-- .../Classes/SEGFirebaseIntegration.m | 2 - 5 files changed, 33 insertions(+), 35 deletions(-) diff --git a/Example/Podfile b/Example/Podfile index f79d8d1..cb41af9 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,4 +1,4 @@ -platform :ios, '10.0' +platform :ios, '11.0' use_frameworks! diff --git a/Package.resolved b/Package.resolved index d2b6819..c065089 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", "state": { "branch": null, - "revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a", - "version": "0.20200225.4" + "revision": "d302de612e3d57c6f4afaf087da18fba8eac72a7", + "version": "0.20220203.1" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/segmentio/analytics-ios.git", "state": { "branch": null, - "revision": "187faa897c826fe0954124da116db3318242f7c3", - "version": "4.1.4" + "revision": "fc64997865619f73bbab196c164f7845a13da110", + "version": "4.1.6" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git", "state": { "branch": null, - "revision": "15889fadef7078dfa1392b0e2b08f3d0e9797104", - "version": "0.7.1" + "revision": "79db6516894a932d0ddaff3b05b9da1e4f6c4069", + "version": "0.9.0" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", "state": { "branch": null, - "revision": "5344857522053b5d4403ec8173ec0d23200a97ea", - "version": "8.11.0" + "revision": "2eb177effe7baf1f13ad0c5f4eb8c71a98429fb5", + "version": "9.1.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", "state": { "branch": null, - "revision": "9b2f6aca5b4685c45f9f5481f19bee8e7982c538", - "version": "8.9.1" + "revision": "192cce3e0486aecfdb61102a9c694c78dc89dc48", + "version": "9.1.0" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/google/GoogleDataTransport.git", "state": { "branch": null, - "revision": "15ccdfd25ac55b9239b82809531ff26605e7556e", - "version": "9.1.2" + "revision": "b905c49326b72211531ed9d7baa02d724828a8dc", + "version": "9.1.4" } }, { @@ -60,17 +60,17 @@ "repositoryURL": "https://github.com/google/GoogleUtilities.git", "state": { "branch": null, - "revision": "b3bb0c5551fb3f80ca939829639ab5b093edd14f", - "version": "7.7.0" + "revision": "f4abe56ce62a779e64b525eb133c8fc2a84bbc1f", + "version": "7.7.1" } }, { "package": "gRPC", - "repositoryURL": "https://github.com/firebase/grpc-SwiftPM.git", + "repositoryURL": "https://github.com/grpc/grpc-ios.git", "state": { "branch": null, - "revision": "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", - "version": "1.28.4" + "revision": "2af4f6e9c2b18beae228f50b1198c641be859d2b", + "version": "1.44.2-grpc" } }, { @@ -78,8 +78,8 @@ "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", "state": { "branch": null, - "revision": "91ed3d188eb95705fef3c249453b81f32dc557d1", - "version": "1.5.0" + "revision": "19605024d59eaefdb1f6a2cb11ebe75df4421126", + "version": "2.0.0" } }, { @@ -96,8 +96,8 @@ "repositoryURL": "https://github.com/firebase/nanopb.git", "state": { "branch": null, - "revision": "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", - "version": "2.30908.0" + "revision": "819d0a2173aff699fb8c364b6fb906f7cdb1a692", + "version": "2.30909.0" } }, { @@ -105,8 +105,8 @@ "repositoryURL": "https://github.com/google/promises.git", "state": { "branch": null, - "revision": "afa9a1ace74e116848d4f743599ab83e584ff8cb", - "version": "1.2.12" + "revision": "46c1e6b5ac09d8f82c991061c659f67e573d425d", + "version": "2.1.0" } }, { @@ -114,8 +114,8 @@ "repositoryURL": "https://github.com/apple/swift-protobuf.git", "state": { "branch": null, - "revision": "bfe4255ff60f22a41cafa113059668571ed5d461", - "version": "1.16.0" + "revision": "e1499bc69b9040b29184f7f2996f7bab467c1639", + "version": "1.19.0" } } ] diff --git a/Package.swift b/Package.swift index abc5ef3..6467129 100644 --- a/Package.swift +++ b/Package.swift @@ -6,15 +6,15 @@ let package = Package( platforms: [.iOS(.v11)], products: [.library(name: "SegmentFirebase", targets: ["SegmentFirebase"])], dependencies: [ - .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.3"), - .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "8.7.0"), + .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.6"), + .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "9.1.0"), ], targets: [ .target( name: "SegmentFirebase", dependencies: [ "Segment", - .product(name: "FirebaseAnalytics", package: "Firebase"), + .product(name: "FirebaseAnalytics", package: "Firebase") ], path: "Segment-Firebase/Classes", publicHeadersPath: "" diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index c48e4fd..f11bd49 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/segment-integrations/analytics-ios-integration-firebase.git", :tag => s.version.to_s } s.social_media_url = 'https://twitter.com/segment' - s.platform = :ios, '10.0' + s.platform = :ios, '11.0' s.requires_arc = true s.source_files = 'Segment-Firebase/Classes/**/*' @@ -24,9 +24,9 @@ Pod::Spec.new do |s| s.static_framework = true s.dependency 'Analytics' - s.dependency 'Firebase', '~> 8.7' - s.dependency 'Firebase/Core', '~> 8.7' - s.dependency 'FirebaseAnalytics','~> 8.7' + s.dependency 'Firebase', '~> 9.1.0' + s.dependency 'Firebase/Core', '~> 9.1.0' + s.dependency 'FirebaseAnalytics','~> 9.1.0' s.subspec 'Core' do |core| #For users who only want the core Firebase package diff --git a/Segment-Firebase/Classes/SEGFirebaseIntegration.m b/Segment-Firebase/Classes/SEGFirebaseIntegration.m index 02db55d..94c8704 100644 --- a/Segment-Firebase/Classes/SEGFirebaseIntegration.m +++ b/Segment-Firebase/Classes/SEGFirebaseIntegration.m @@ -118,10 +118,8 @@ - (NSString *)formatFirebaseEventNames:(NSString *)event kFIREventAddToCart, @"Product Added", kFIREventRemoveFromCart, @"Product Removed", kFIREventBeginCheckout, @"Checkout Started", - kFIREventPresentOffer, @"Promotion Viewed", kFIREventAddPaymentInfo, @"Payment Info Entered", kFIREventPurchase, @"Order Completed", - kFIREventPurchaseRefund, @"Order Refunded", kFIREventViewItemList, @"Product List Viewed", kFIREventAddToWishlist, @"Product Added to Wishlist", kFIREventShare, @"Product Shared", From 9321e1624585f4fc4bd590b3ac8d5671294e6851 Mon Sep 17 00:00:00 2001 From: Michael Grosse Huelsewiesche Date: Fri, 24 Jun 2022 17:35:18 -0400 Subject: [PATCH 08/15] Updating some old deprecations that finally went away, with a minor version bump that just released (#90) --- Package.resolved | 4 ++-- Package.swift | 2 +- Segment-Firebase.podspec | 6 +++--- Segment-Firebase/Classes/SEGFirebaseIntegration.m | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Package.resolved b/Package.resolved index c065089..e44274f 100644 --- a/Package.resolved +++ b/Package.resolved @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", "state": { "branch": null, - "revision": "2eb177effe7baf1f13ad0c5f4eb8c71a98429fb5", - "version": "9.1.0" + "revision": "e8828e8efc813817b3c2cbfde8e965f7a7a26641", + "version": "9.2.0" } }, { diff --git a/Package.swift b/Package.swift index 6467129..2410b91 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let package = Package( products: [.library(name: "SegmentFirebase", targets: ["SegmentFirebase"])], dependencies: [ .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.6"), - .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "9.1.0"), + .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "9.2.0"), ], targets: [ .target( diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index f11bd49..fcba57e 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -24,9 +24,9 @@ Pod::Spec.new do |s| s.static_framework = true s.dependency 'Analytics' - s.dependency 'Firebase', '~> 9.1.0' - s.dependency 'Firebase/Core', '~> 9.1.0' - s.dependency 'FirebaseAnalytics','~> 9.1.0' + s.dependency 'Firebase', '~> 9.2.0' + s.dependency 'Firebase/Core', '~> 9.2.0' + s.dependency 'FirebaseAnalytics','~> 9.2.0' s.subspec 'Core' do |core| #For users who only want the core Firebase package diff --git a/Segment-Firebase/Classes/SEGFirebaseIntegration.m b/Segment-Firebase/Classes/SEGFirebaseIntegration.m index 94c8704..c8d54b5 100644 --- a/Segment-Firebase/Classes/SEGFirebaseIntegration.m +++ b/Segment-Firebase/Classes/SEGFirebaseIntegration.m @@ -118,8 +118,10 @@ - (NSString *)formatFirebaseEventNames:(NSString *)event kFIREventAddToCart, @"Product Added", kFIREventRemoveFromCart, @"Product Removed", kFIREventBeginCheckout, @"Checkout Started", + kFIREventViewPromotion, @"Promotion Viewed", kFIREventAddPaymentInfo, @"Payment Info Entered", kFIREventPurchase, @"Order Completed", + kFIREventRefund, @"Order Refunded", kFIREventViewItemList, @"Product List Viewed", kFIREventAddToWishlist, @"Product Added to Wishlist", kFIREventShare, @"Product Shared", From 6fbde02453487ef4908699269f2734a1bed0d758 Mon Sep 17 00:00:00 2001 From: Michael Grosse Huelsewiesche Date: Fri, 24 Jun 2022 17:47:40 -0400 Subject: [PATCH 09/15] Prepare for release 2.7.10. --- CHANGELOG.md | 4 ++++ Segment-Firebase.podspec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63e53b0..3752011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Change Log ========== +Version 2.7.10 *(24th June, 2022)* +------------------------------------------- +* Bumped Firebase to version 9.2+ + Version 2.7.9 *(21st January, 2022)* ------------------------------------------- * Fix compilation issue w/ SPM. diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index fcba57e..1444df4 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Firebase" - s.version = "2.7.9" + s.version = "2.7.10" s.summary = "Firebase Integration for Segment's analytics-ios library." s.description = <<-DESC From 8f17c1fe19e26d0c7f87ee32dc1431cbbd30d8c9 Mon Sep 17 00:00:00 2001 From: Alan Charles Date: Fri, 30 Sep 2022 12:28:57 -0600 Subject: [PATCH 10/15] bump firebase dependency to 9.6.0 --- Example/Podfile.lock | 195 +++++++++--------- .../project.pbxproj | 2 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + Example/Segment-Firebase/Main.storyboard | 22 +- Segment-Firebase.podspec | 6 +- 5 files changed, 127 insertions(+), 106 deletions(-) create mode 100644 Example/Segment-Firebase.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 6240b87..3f93051 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,109 +1,112 @@ PODS: - Analytics (4.1.6) - Expecta (1.0.6) - - Firebase (8.10.0): - - Firebase/Core (= 8.10.0) - - Firebase/Core (8.10.0): + - Firebase (9.6.0): + - Firebase/Core (= 9.6.0) + - Firebase/Core (9.6.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 8.10.0) - - Firebase/CoreOnly (8.10.0): - - FirebaseCore (= 8.10.0) - - FirebaseAnalytics (8.10.0): - - FirebaseAnalytics/AdIdSupport (= 8.10.0) - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - FirebaseAnalytics/AdIdSupport (8.10.0): - - FirebaseCore (~> 8.0) - - FirebaseInstallations (~> 8.0) - - GoogleAppMeasurement (= 8.10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - FirebaseCore (8.10.0): - - FirebaseCoreDiagnostics (~> 8.0) - - GoogleUtilities/Environment (~> 7.6) - - GoogleUtilities/Logger (~> 7.6) - - FirebaseCoreDiagnostics (8.11.0): - - GoogleDataTransport (~> 9.1) + - FirebaseAnalytics (~> 9.6.0) + - Firebase/CoreOnly (9.6.0): + - FirebaseCore (= 9.6.0) + - FirebaseAnalytics (9.6.0): + - FirebaseAnalytics/AdIdSupport (= 9.6.0) + - FirebaseCore (~> 9.0) + - FirebaseInstallations (~> 9.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseAnalytics/AdIdSupport (9.6.0): + - FirebaseCore (~> 9.0) + - FirebaseInstallations (~> 9.0) + - GoogleAppMeasurement (= 9.6.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseCore (9.6.0): + - FirebaseCoreDiagnostics (~> 9.0) + - FirebaseCoreInternal (~> 9.0) - GoogleUtilities/Environment (~> 7.7) - GoogleUtilities/Logger (~> 7.7) - - nanopb (~> 2.30908.0) - - FirebaseInstallations (8.11.0): - - FirebaseCore (~> 8.0) + - FirebaseCoreDiagnostics (9.6.0): + - GoogleDataTransport (< 10.0.0, >= 9.1.4) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Logger (~> 7.7) + - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseCoreInternal (9.6.0): + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseInstallations (9.6.0): + - FirebaseCore (~> 9.0) - GoogleUtilities/Environment (~> 7.7) - GoogleUtilities/UserDefaults (~> 7.7) + - PromisesObjC (~> 2.1) + - GoogleAppMeasurement (9.6.0): + - GoogleAppMeasurement/AdIdSupport (= 9.6.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleAppMeasurement/AdIdSupport (9.6.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 9.6.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleAppMeasurement/WithoutAdIdSupport (9.6.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.7) + - GoogleUtilities/MethodSwizzler (~> 7.7) + - GoogleUtilities/Network (~> 7.7) + - "GoogleUtilities/NSData+zlib (~> 7.7)" + - nanopb (< 2.30910.0, >= 2.30908.0) + - GoogleDataTransport (9.2.0): + - GoogleUtilities/Environment (~> 7.7) + - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleAppMeasurement (8.10.0): - - GoogleAppMeasurement/AdIdSupport (= 8.10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (8.10.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 8.10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (8.10.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.6) - - GoogleUtilities/MethodSwizzler (~> 7.6) - - GoogleUtilities/Network (~> 7.6) - - "GoogleUtilities/NSData+zlib (~> 7.6)" - - nanopb (~> 2.30908.0) - - GoogleDataTransport (9.1.2): - - GoogleUtilities/Environment (~> 7.2) - - nanopb (~> 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GoogleUtilities/AppDelegateSwizzler (7.8.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.8.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.8.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.7.0): + - GoogleUtilities/MethodSwizzler (7.8.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.8.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.8.0)" + - GoogleUtilities/Reachability (7.8.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.8.0): - GoogleUtilities/Logger - - nanopb (2.30908.0): - - nanopb/decode (= 2.30908.0) - - nanopb/encode (= 2.30908.0) - - nanopb/decode (2.30908.0) - - nanopb/encode (2.30908.0) + - nanopb (2.30909.0): + - nanopb/decode (= 2.30909.0) + - nanopb/encode (= 2.30909.0) + - nanopb/decode (2.30909.0) + - nanopb/encode (2.30909.0) - OCHamcrest (8.0.0) - OCMockito (6.0.0): - OCHamcrest (~> 8.0) - - PromisesObjC (2.0.0) - - Segment-Firebase (2.7.8): + - PromisesObjC (2.1.1) + - Segment-Firebase (2.7.10): - Analytics - - Firebase (~> 8.7) - - Firebase/Core (~> 8.7) - - FirebaseAnalytics (~> 8.7) - - Segment-Firebase/Core (= 2.7.8) - - Segment-Firebase/Core (2.7.8): + - Firebase (~> 9.6.0) + - Firebase/Core (~> 9.6.0) + - FirebaseAnalytics (~> 9.6.0) + - Segment-Firebase/Core (= 2.7.10) + - Segment-Firebase/Core (2.7.10): - Analytics - - Firebase (~> 8.7) - - Firebase/Core (~> 8.7) - - FirebaseAnalytics (~> 8.7) - - Specta (1.0.7) + - Firebase (~> 9.6.0) + - Firebase/Core (~> 9.6.0) + - FirebaseAnalytics (~> 9.6.0) + - Specta (2.0.0) DEPENDENCIES: - Expecta @@ -119,6 +122,7 @@ SPEC REPOS: - FirebaseAnalytics - FirebaseCore - FirebaseCoreDiagnostics + - FirebaseCoreInternal - FirebaseInstallations - GoogleAppMeasurement - GoogleDataTransport @@ -136,21 +140,22 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Analytics: eefe524436f904b8bb3f8c8c3425280e43b34efc Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 - Firebase: 44213362f1dcc52555b935dc925ed35ac55f1b20 - FirebaseAnalytics: 319c9b3b1bdd400d60e2f415dff0c5f6959e6760 - FirebaseCore: 04186597c095da37d90ff9fd3e53bc61a1ff2440 - FirebaseCoreDiagnostics: 64d9709d804a6c25bd77841371c1fcfd909d5601 - FirebaseInstallations: 044eede8a049bce71c4541ee68d6e4364fcbe774 - GoogleAppMeasurement: a3311dbcf3ea651e5a070fe8559b57c174ada081 - GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 - nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 + Firebase: 5ae8b7cf8efce559a653aef0ad95bab3f427c351 + FirebaseAnalytics: 89ad762c6c3852a685794174757e2c60a36b6a82 + FirebaseCore: 2082fffcd855f95f883c0a1641133eb9bbe76d40 + FirebaseCoreDiagnostics: 99a495094b10a57eeb3ae8efa1665700ad0bdaa6 + FirebaseCoreInternal: bca76517fe1ed381e989f5e7d8abb0da8d85bed3 + FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e + GoogleAppMeasurement: 6de2b1a69e4326eb82ee05d138f6a5cb7311bcb1 + GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f + GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7 + nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 OCHamcrest: a613690381f1dac7637c18962c10dbe8feca4bb5 OCMockito: 780f04370226f81a9d972c97d1203864ef609f5b - PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58 - Segment-Firebase: e4515bc7e36d5f0435d122a8c225c43db1504c02 - Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 + PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb + Segment-Firebase: 36d699e36e7a2269476a9081bd2461d820e6fdd8 + Specta: b79d84043684b35ffdc2680df578dc318ec2efc2 -PODFILE CHECKSUM: 6ed9d49cabf18e7f28eb6b1e1c6f84ce781f3324 +PODFILE CHECKSUM: 2c6ff7ca8d5b9826542864d0ab6166c58179de30 -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/Example/Segment-Firebase.xcodeproj/project.pbxproj b/Example/Segment-Firebase.xcodeproj/project.pbxproj index f2ce51e..6352b59 100644 --- a/Example/Segment-Firebase.xcodeproj/project.pbxproj +++ b/Example/Segment-Firebase.xcodeproj/project.pbxproj @@ -307,6 +307,7 @@ "${BUILT_PRODUCTS_DIR}/Analytics/Segment.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", @@ -318,6 +319,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Segment.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", diff --git a/Example/Segment-Firebase.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/Segment-Firebase.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Example/Segment-Firebase.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/Segment-Firebase/Main.storyboard b/Example/Segment-Firebase/Main.storyboard index a64598f..a90f732 100644 --- a/Example/Segment-Firebase/Main.storyboard +++ b/Example/Segment-Firebase/Main.storyboard @@ -1,8 +1,10 @@ - - + + + - + + @@ -14,18 +16,22 @@ - + - - + + + + + @@ -33,4 +39,4 @@ - + \ No newline at end of file diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index 1444df4..76e8dc0 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -24,9 +24,9 @@ Pod::Spec.new do |s| s.static_framework = true s.dependency 'Analytics' - s.dependency 'Firebase', '~> 9.2.0' - s.dependency 'Firebase/Core', '~> 9.2.0' - s.dependency 'FirebaseAnalytics','~> 9.2.0' + s.dependency 'Firebase', '~> 9.6.0' + s.dependency 'Firebase/Core', '~> 9.6.0' + s.dependency 'FirebaseAnalytics','~> 9.6.0' s.subspec 'Core' do |core| #For users who only want the core Firebase package From 32765a13aac3e86832b810cae3ce40f5f54bd294 Mon Sep 17 00:00:00 2001 From: Alan Charles Date: Tue, 4 Oct 2022 10:46:39 -0600 Subject: [PATCH 11/15] Prepare for release 2.7.11 --- CHANGELOG.md | 4 ++++ Segment-Firebase.podspec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3752011..35b2e31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Change Log ========== +Version 2.7.11 *(24th June, 2022)* +------------------------------------------- +* Bumped Firebase to version 9.6.0 + Version 2.7.10 *(24th June, 2022)* ------------------------------------------- * Bumped Firebase to version 9.2+ diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index 76e8dc0..8ae1f18 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Firebase" - s.version = "2.7.10" + s.version = "2.7.11" s.summary = "Firebase Integration for Segment's analytics-ios library." s.description = <<-DESC From 2cb1d683d3427dd5d306757bb7ead76f854ae91e Mon Sep 17 00:00:00 2001 From: kdhingra07 <117076321+kdhingra07@users.noreply.github.com> Date: Thu, 1 Dec 2022 06:57:29 +0530 Subject: [PATCH 12/15] Prepare for release 10.2.0 (#96) * Prepare for release 10.2.0 * updated pods as well --- CHANGELOG.md | 4 + Example/Podfile.lock | 162 ++++++++---------- .../project.pbxproj | 4 - Package.resolved | 20 +-- Package.swift | 2 +- Segment-Firebase.podspec | 8 +- 6 files changed, 93 insertions(+), 107 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35b2e31..b764bc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Change Log ========== +Version 2.7.12 *(30th November, 2022)* +------------------------------------------- +* Bumped Firebase to version 10.2.0 + Version 2.7.11 *(24th June, 2022)* ------------------------------------------- * Bumped Firebase to version 9.6.0 diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 3f93051..7bbe0a3 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,90 +1,80 @@ PODS: - Analytics (4.1.6) - Expecta (1.0.6) - - Firebase (9.6.0): - - Firebase/Core (= 9.6.0) - - Firebase/Core (9.6.0): + - Firebase (10.2.0): + - Firebase/Core (= 10.2.0) + - Firebase/Core (10.2.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 9.6.0) - - Firebase/CoreOnly (9.6.0): - - FirebaseCore (= 9.6.0) - - FirebaseAnalytics (9.6.0): - - FirebaseAnalytics/AdIdSupport (= 9.6.0) - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseAnalytics (~> 10.2.0) + - Firebase/CoreOnly (10.2.0): + - FirebaseCore (= 10.2.0) + - FirebaseAnalytics (10.2.0): + - FirebaseAnalytics/AdIdSupport (= 10.2.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (9.6.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleAppMeasurement (= 9.6.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - FirebaseAnalytics/AdIdSupport (10.2.0): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleAppMeasurement (= 10.2.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCore (9.6.0): - - FirebaseCoreDiagnostics (~> 9.0) - - FirebaseCoreInternal (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (9.6.0): - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCoreInternal (9.6.0): - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseInstallations (9.6.0): - - FirebaseCore (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) + - FirebaseCore (10.2.0): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/Logger (~> 7.8) + - FirebaseCoreInternal (10.2.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseInstallations (10.2.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - GoogleAppMeasurement (9.6.0): - - GoogleAppMeasurement/AdIdSupport (= 9.6.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (9.6.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 9.6.0) - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement (10.2.0): + - GoogleAppMeasurement/AdIdSupport (= 10.2.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (9.6.0): - - GoogleUtilities/AppDelegateSwizzler (~> 7.7) - - GoogleUtilities/MethodSwizzler (~> 7.7) - - GoogleUtilities/Network (~> 7.7) - - "GoogleUtilities/NSData+zlib (~> 7.7)" + - GoogleAppMeasurement/AdIdSupport (10.2.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.2.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleDataTransport (9.2.0): - - GoogleUtilities/Environment (~> 7.7) + - GoogleAppMeasurement/WithoutAdIdSupport (10.2.0): + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/MethodSwizzler (~> 7.8) + - GoogleUtilities/Network (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.8.0): + - GoogleUtilities/AppDelegateSwizzler (7.10.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.8.0): + - GoogleUtilities/Environment (7.10.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.8.0): + - GoogleUtilities/Logger (7.10.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.8.0): + - GoogleUtilities/MethodSwizzler (7.10.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.8.0): + - GoogleUtilities/Network (7.10.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.8.0)" - - GoogleUtilities/Reachability (7.8.0): + - "GoogleUtilities/NSData+zlib (7.10.0)" + - GoogleUtilities/Reachability (7.10.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.8.0): + - GoogleUtilities/UserDefaults (7.10.0): - GoogleUtilities/Logger - nanopb (2.30909.0): - nanopb/decode (= 2.30909.0) @@ -95,17 +85,17 @@ PODS: - OCMockito (6.0.0): - OCHamcrest (~> 8.0) - PromisesObjC (2.1.1) - - Segment-Firebase (2.7.10): + - Segment-Firebase (2.7.12): - Analytics - - Firebase (~> 9.6.0) - - Firebase/Core (~> 9.6.0) - - FirebaseAnalytics (~> 9.6.0) - - Segment-Firebase/Core (= 2.7.10) - - Segment-Firebase/Core (2.7.10): + - Firebase (~> 10.2.0) + - Firebase/Core (~> 10.2.0) + - FirebaseAnalytics (~> 10.2.0) + - Segment-Firebase/Core (= 2.7.12) + - Segment-Firebase/Core (2.7.12): - Analytics - - Firebase (~> 9.6.0) - - Firebase/Core (~> 9.6.0) - - FirebaseAnalytics (~> 9.6.0) + - Firebase (~> 10.2.0) + - Firebase/Core (~> 10.2.0) + - FirebaseAnalytics (~> 10.2.0) - Specta (2.0.0) DEPENDENCIES: @@ -121,11 +111,9 @@ SPEC REPOS: - Firebase - FirebaseAnalytics - FirebaseCore - - FirebaseCoreDiagnostics - FirebaseCoreInternal - FirebaseInstallations - GoogleAppMeasurement - - GoogleDataTransport - GoogleUtilities - nanopb - OCHamcrest @@ -140,20 +128,18 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Analytics: eefe524436f904b8bb3f8c8c3425280e43b34efc Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 - Firebase: 5ae8b7cf8efce559a653aef0ad95bab3f427c351 - FirebaseAnalytics: 89ad762c6c3852a685794174757e2c60a36b6a82 - FirebaseCore: 2082fffcd855f95f883c0a1641133eb9bbe76d40 - FirebaseCoreDiagnostics: 99a495094b10a57eeb3ae8efa1665700ad0bdaa6 - FirebaseCoreInternal: bca76517fe1ed381e989f5e7d8abb0da8d85bed3 - FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e - GoogleAppMeasurement: 6de2b1a69e4326eb82ee05d138f6a5cb7311bcb1 - GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7 + Firebase: a3ea7eba4382afd83808376edb99acdaff078dcf + FirebaseAnalytics: 24a15e58e505abcedc3017b6f7c206fbfa964580 + FirebaseCore: 813838072b797b64f529f3c2ee35e696e5641dd1 + FirebaseCoreInternal: 091bde13e47bb1c5e9fe397634f3593dc390430f + FirebaseInstallations: 004915af170935e3a583faefd5f8bc851afc220f + GoogleAppMeasurement: 3bc3a6484b7bb20dd8489242c4dd3c92a3e5107b + GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 OCHamcrest: a613690381f1dac7637c18962c10dbe8feca4bb5 OCMockito: 780f04370226f81a9d972c97d1203864ef609f5b PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb - Segment-Firebase: 36d699e36e7a2269476a9081bd2461d820e6fdd8 + Segment-Firebase: 6000de0f15ec523b3be304d4802ce864bfe39d64 Specta: b79d84043684b35ffdc2680df578dc318ec2efc2 PODFILE CHECKSUM: 2c6ff7ca8d5b9826542864d0ab6166c58179de30 diff --git a/Example/Segment-Firebase.xcodeproj/project.pbxproj b/Example/Segment-Firebase.xcodeproj/project.pbxproj index 6352b59..eb586c1 100644 --- a/Example/Segment-Firebase.xcodeproj/project.pbxproj +++ b/Example/Segment-Firebase.xcodeproj/project.pbxproj @@ -306,10 +306,8 @@ "${PODS_ROOT}/Target Support Files/Pods-Segment-Firebase_Example/Pods-Segment-Firebase_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Analytics/Segment.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", - "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", @@ -318,10 +316,8 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Segment.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", diff --git a/Package.resolved b/Package.resolved index e44274f..cddd1ef 100644 --- a/Package.resolved +++ b/Package.resolved @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", "state": { "branch": null, - "revision": "e8828e8efc813817b3c2cbfde8e965f7a7a26641", - "version": "9.2.0" + "revision": "c24031ad9410c746c49deddc739fdf311a386fc7", + "version": "10.2.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", "state": { "branch": null, - "revision": "192cce3e0486aecfdb61102a9c694c78dc89dc48", - "version": "9.1.0" + "revision": "71eb6700dd53a851473c48d392f00a3ab26699a6", + "version": "10.1.0" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/google/GoogleDataTransport.git", "state": { "branch": null, - "revision": "b905c49326b72211531ed9d7baa02d724828a8dc", - "version": "9.1.4" + "revision": "5056b15c5acbb90cd214fe4d6138bdf5a740e5a8", + "version": "9.2.0" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/google/GoogleUtilities.git", "state": { "branch": null, - "revision": "f4abe56ce62a779e64b525eb133c8fc2a84bbc1f", - "version": "7.7.1" + "revision": "6db6edb48bdd9943426562c7f042a5492de5ba3d", + "version": "7.10.0" } }, { @@ -78,8 +78,8 @@ "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", "state": { "branch": null, - "revision": "19605024d59eaefdb1f6a2cb11ebe75df4421126", - "version": "2.0.0" + "revision": "efda500b6d9858d38a76dbfbfa396bd644692e4a", + "version": "3.0.0" } }, { diff --git a/Package.swift b/Package.swift index 2410b91..aa6e628 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let package = Package( products: [.library(name: "SegmentFirebase", targets: ["SegmentFirebase"])], dependencies: [ .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.6"), - .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "9.2.0"), + .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.2.0"), ], targets: [ .target( diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index 8ae1f18..10d1583 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Firebase" - s.version = "2.7.11" + s.version = "2.7.12" s.summary = "Firebase Integration for Segment's analytics-ios library." s.description = <<-DESC @@ -24,9 +24,9 @@ Pod::Spec.new do |s| s.static_framework = true s.dependency 'Analytics' - s.dependency 'Firebase', '~> 9.6.0' - s.dependency 'Firebase/Core', '~> 9.6.0' - s.dependency 'FirebaseAnalytics','~> 9.6.0' + s.dependency 'Firebase', '~> 10.2.0' + s.dependency 'Firebase/Core', '~> 10.2.0' + s.dependency 'FirebaseAnalytics','~> 10.2.0' s.subspec 'Core' do |core| #For users who only want the core Firebase package From fb8e30afc508dcb20ef38a0a2d3ba65c5d068fb9 Mon Sep 17 00:00:00 2001 From: Michael Grosse Huelsewiesche Date: Wed, 30 Nov 2022 20:52:23 -0500 Subject: [PATCH 13/15] Updating swift version handling for podspec --- .swift-version | 1 - Segment-Firebase.podspec | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index bb576db..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -2.3 diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index 10d1583..da0f25d 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -16,6 +16,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/segment-integrations/analytics-ios-integration-firebase.git", :tag => s.version.to_s } s.social_media_url = 'https://twitter.com/segment' + s.swift_version = '4.0' s.platform = :ios, '11.0' s.requires_arc = true From b62d2e7dbf459fe77a14c72a6463a948966d238a Mon Sep 17 00:00:00 2001 From: Pierrick Lete Date: Mon, 13 Mar 2023 22:32:44 +0100 Subject: [PATCH 14/15] bump firebase version --- Example/Podfile.lock | 86 ++++++++++++++++++++-------------------- Package.resolved | 8 ++-- Package.swift | 2 +- Segment-Firebase.podspec | 6 +-- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 7bbe0a3..7df7b0a 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,15 +1,15 @@ PODS: - Analytics (4.1.6) - Expecta (1.0.6) - - Firebase (10.2.0): - - Firebase/Core (= 10.2.0) - - Firebase/Core (10.2.0): + - Firebase (10.6.0): + - Firebase/Core (= 10.6.0) + - Firebase/Core (10.6.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 10.2.0) - - Firebase/CoreOnly (10.2.0): - - FirebaseCore (= 10.2.0) - - FirebaseAnalytics (10.2.0): - - FirebaseAnalytics/AdIdSupport (= 10.2.0) + - FirebaseAnalytics (~> 10.6.0) + - Firebase/CoreOnly (10.6.0): + - FirebaseCore (= 10.6.0) + - FirebaseAnalytics (10.6.0): + - FirebaseAnalytics/AdIdSupport (= 10.6.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) @@ -17,64 +17,64 @@ PODS: - GoogleUtilities/Network (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (10.2.0): + - FirebaseAnalytics/AdIdSupport (10.6.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - - GoogleAppMeasurement (= 10.2.0) + - GoogleAppMeasurement (= 10.6.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - GoogleUtilities/Network (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCore (10.2.0): + - FirebaseCore (10.6.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreInternal (10.2.0): + - FirebaseCoreInternal (10.6.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseInstallations (10.2.0): + - FirebaseInstallations (10.6.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - GoogleAppMeasurement (10.2.0): - - GoogleAppMeasurement/AdIdSupport (= 10.2.0) + - GoogleAppMeasurement (10.6.0): + - GoogleAppMeasurement/AdIdSupport (= 10.6.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - GoogleUtilities/Network (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (10.2.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.2.0) + - GoogleAppMeasurement/AdIdSupport (10.6.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.6.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - GoogleUtilities/Network (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (10.2.0): + - GoogleAppMeasurement/WithoutAdIdSupport (10.6.0): - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - GoogleUtilities/Network (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleUtilities/AppDelegateSwizzler (7.10.0): + - GoogleUtilities/AppDelegateSwizzler (7.11.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.10.0): + - GoogleUtilities/Environment (7.11.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.10.0): + - GoogleUtilities/Logger (7.11.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.10.0): + - GoogleUtilities/MethodSwizzler (7.11.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.10.0): + - GoogleUtilities/Network (7.11.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.10.0)" - - GoogleUtilities/Reachability (7.10.0): + - "GoogleUtilities/NSData+zlib (7.11.0)" + - GoogleUtilities/Reachability (7.11.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.10.0): + - GoogleUtilities/UserDefaults (7.11.0): - GoogleUtilities/Logger - nanopb (2.30909.0): - nanopb/decode (= 2.30909.0) @@ -84,18 +84,18 @@ PODS: - OCHamcrest (8.0.0) - OCMockito (6.0.0): - OCHamcrest (~> 8.0) - - PromisesObjC (2.1.1) + - PromisesObjC (2.2.0) - Segment-Firebase (2.7.12): - Analytics - - Firebase (~> 10.2.0) - - Firebase/Core (~> 10.2.0) - - FirebaseAnalytics (~> 10.2.0) + - Firebase (~> 10.6.0) + - Firebase/Core (~> 10.6.0) + - FirebaseAnalytics (~> 10.6.0) - Segment-Firebase/Core (= 2.7.12) - Segment-Firebase/Core (2.7.12): - Analytics - - Firebase (~> 10.2.0) - - Firebase/Core (~> 10.2.0) - - FirebaseAnalytics (~> 10.2.0) + - Firebase (~> 10.6.0) + - Firebase/Core (~> 10.6.0) + - FirebaseAnalytics (~> 10.6.0) - Specta (2.0.0) DEPENDENCIES: @@ -128,20 +128,20 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Analytics: eefe524436f904b8bb3f8c8c3425280e43b34efc Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 - Firebase: a3ea7eba4382afd83808376edb99acdaff078dcf - FirebaseAnalytics: 24a15e58e505abcedc3017b6f7c206fbfa964580 - FirebaseCore: 813838072b797b64f529f3c2ee35e696e5641dd1 - FirebaseCoreInternal: 091bde13e47bb1c5e9fe397634f3593dc390430f - FirebaseInstallations: 004915af170935e3a583faefd5f8bc851afc220f - GoogleAppMeasurement: 3bc3a6484b7bb20dd8489242c4dd3c92a3e5107b - GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 + Firebase: f13680471b021937f2230ea8503c7809d8c29806 + FirebaseAnalytics: 9f382605c5ee412b039212f054bf7a403d9850c1 + FirebaseCore: fa80ad16a62d52f67274b5b88304c3a318bbf9a4 + FirebaseCoreInternal: c7cd505e2136811096b225ac388d6254a2622362 + FirebaseInstallations: 13dde135fa0524e15bddb133ccc8465c53a1b3f3 + GoogleAppMeasurement: 686b48c3c895f3c55c70719041913d5d150b74f6 + GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 OCHamcrest: a613690381f1dac7637c18962c10dbe8feca4bb5 OCMockito: 780f04370226f81a9d972c97d1203864ef609f5b - PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb - Segment-Firebase: 6000de0f15ec523b3be304d4802ce864bfe39d64 + PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef + Segment-Firebase: 51000eb031fd9b990fb79c9a38ad5d73cebd4f9c Specta: b79d84043684b35ffdc2680df578dc318ec2efc2 PODFILE CHECKSUM: 2c6ff7ca8d5b9826542864d0ab6166c58179de30 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.0 diff --git a/Package.resolved b/Package.resolved index cddd1ef..fc11e75 100644 --- a/Package.resolved +++ b/Package.resolved @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", "state": { "branch": null, - "revision": "c24031ad9410c746c49deddc739fdf311a386fc7", - "version": "10.2.0" + "revision": "60f9a33e7084482df67b48e16f315f4f7a6f5da9", + "version": "10.6.0" } }, { @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", "state": { "branch": null, - "revision": "71eb6700dd53a851473c48d392f00a3ab26699a6", - "version": "10.1.0" + "revision": "04351180d4c757c6c16127cb57b685fff9ef260b", + "version": "10.6.0" } }, { diff --git a/Package.swift b/Package.swift index aa6e628..203cdb4 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,7 @@ let package = Package( products: [.library(name: "SegmentFirebase", targets: ["SegmentFirebase"])], dependencies: [ .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git", from: "4.1.6"), - .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.2.0"), + .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.6.0"), ], targets: [ .target( diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index da0f25d..7fdd5c5 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -25,9 +25,9 @@ Pod::Spec.new do |s| s.static_framework = true s.dependency 'Analytics' - s.dependency 'Firebase', '~> 10.2.0' - s.dependency 'Firebase/Core', '~> 10.2.0' - s.dependency 'FirebaseAnalytics','~> 10.2.0' + s.dependency 'Firebase', '~> 10.6.0' + s.dependency 'Firebase/Core', '~> 10.6.0' + s.dependency 'FirebaseAnalytics','~> 10.6.0' s.subspec 'Core' do |core| #For users who only want the core Firebase package From 502cfb2bdd85d84b612ee4ca2c9de04b9081a0e3 Mon Sep 17 00:00:00 2001 From: Alan Charles Date: Wed, 26 Apr 2023 15:55:13 -0600 Subject: [PATCH 15/15] Prepare for release 2.7.13 --- CHANGELOG.md | 5 +++++ Segment-Firebase.podspec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b764bc6..7093119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Change Log ========== +Version 2.7.13 *(26th April, 2023)* +------------------------------------------- +* Bumped Firebase to version 10.6.0 + + Version 2.7.12 *(30th November, 2022)* ------------------------------------------- * Bumped Firebase to version 10.2.0 diff --git a/Segment-Firebase.podspec b/Segment-Firebase.podspec index 7fdd5c5..94c2664 100644 --- a/Segment-Firebase.podspec +++ b/Segment-Firebase.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Firebase" - s.version = "2.7.12" + s.version = "2.7.13" s.summary = "Firebase Integration for Segment's analytics-ios library." s.description = <<-DESC